Commit b62d8dbe authored by Arvind Yadav's avatar Arvind Yadav Committed by Lee Jones
Browse files

mfd: t7l66xb: Handle return value of clk_prepare_enable 



clk_prepare_enable() can fail here and we must check its return value.
we must disable clock, if t7l66xb_probe is not successful.

Signed-off-by: default avatarArvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent e10feb36

drivers/mfd/t7l66xb.c

+14 −3
Original line number Original line Diff line number Diff line
@@ -86,8 +86,11 @@ static int t7l66xb_mmc_enable(struct platform_device *mmc) 
	struct t7l66xb *t7l66xb = platform_get_drvdata(dev);

	struct t7l66xb *t7l66xb = platform_get_drvdata(dev);

	unsigned long flags;

	unsigned long flags;

	u8 dev_ctl;

	u8 dev_ctl;

	int ret;





	clk_prepare_enable(t7l66xb->clk32k);

	ret = clk_prepare_enable(t7l66xb->clk32k);

	if (ret)

		return ret;





	raw_spin_lock_irqsave(&t7l66xb->lock, flags);

	raw_spin_lock_irqsave(&t7l66xb->lock, flags);
@@ -286,8 +289,12 @@ static int t7l66xb_resume(struct platform_device *dev) 
{

{

	struct t7l66xb *t7l66xb = platform_get_drvdata(dev);

	struct t7l66xb *t7l66xb = platform_get_drvdata(dev);

	struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);

	struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);

	int ret;



	ret = clk_prepare_enable(t7l66xb->clk48m);

	if (ret)

		return ret;





	clk_prepare_enable(t7l66xb->clk48m);

	if (pdata && pdata->resume)

	if (pdata && pdata->resume)

		pdata->resume(dev);

		pdata->resume(dev);
@@ -361,7 +368,9 @@ static int t7l66xb_probe(struct platform_device *dev) 
		goto err_ioremap;

		goto err_ioremap;

	}

	}





	clk_prepare_enable(t7l66xb->clk48m);

	ret = clk_prepare_enable(t7l66xb->clk48m);

	if (ret)

		goto err_clk_enable;





	if (pdata->enable)

	if (pdata->enable)

		pdata->enable(dev);

		pdata->enable(dev);
@@ -386,6 +395,8 @@ static int t7l66xb_probe(struct platform_device *dev) 
		return 0;

		return 0;





	t7l66xb_detach_irq(dev);

	t7l66xb_detach_irq(dev);

	clk_disable_unprepare(t7l66xb->clk48m);

err_clk_enable:

	iounmap(t7l66xb->scr);

	iounmap(t7l66xb->scr);

err_ioremap:

err_ioremap:

	release_resource(&t7l66xb->rscr);

	release_resource(&t7l66xb->rscr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE