| Message ID | 1413576841-5707-1-git-send-email-festevam@gmail.com |
|---|---|
| State | Accepted |
| Commit | 77adc085aee0c96dc3536403b197707316c7c241 |
| Headers | show |
On Fri, Oct 17, 2014 at 05:14:01PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > When clk_prepare_enable(q->clk) fails it is clearer to disable the previous > acquired clock (q->clk_en) in the error path rather than doing it locally. > > So disable q->clk_en in the error path only. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > drivers/mtd/spi-nor/fsl-quadspi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c > index e1c517d..8006f26 100644 > --- a/drivers/mtd/spi-nor/fsl-quadspi.c > +++ b/drivers/mtd/spi-nor/fsl-quadspi.c > @@ -843,9 +843,8 @@ static int fsl_qspi_probe(struct platform_device *pdev) > > ret = clk_prepare_enable(q->clk); > if (ret) { > - clk_disable_unprepare(q->clk_en); > dev_err(dev, "can not enable the qspi clock\n"); > - goto map_failed; > + goto clk_failed; > } > > /* find the irq */ > @@ -966,6 +965,7 @@ last_init_failed: > > irq_failed: > clk_disable_unprepare(q->clk); > +clk_failed: > clk_disable_unprepare(q->clk_en); > map_failed: > dev_err(dev, "Freescale QuadSPI probe failed\n"); > -- > 1.9.1 Acked-by: Huang Shijie <shijie8@gmail.com>
On Fri, Oct 17, 2014 at 05:14:01PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > When clk_prepare_enable(q->clk) fails it is clearer to disable the previous > acquired clock (q->clk_en) in the error path rather than doing it locally. > > So disable q->clk_en in the error path only. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Pushed to l2-mtd.git. Brian
diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index e1c517d..8006f26 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -843,9 +843,8 @@ static int fsl_qspi_probe(struct platform_device *pdev) ret = clk_prepare_enable(q->clk); if (ret) { - clk_disable_unprepare(q->clk_en); dev_err(dev, "can not enable the qspi clock\n"); - goto map_failed; + goto clk_failed; } /* find the irq */ @@ -966,6 +965,7 @@ last_init_failed: irq_failed: clk_disable_unprepare(q->clk); +clk_failed: clk_disable_unprepare(q->clk_en); map_failed: dev_err(dev, "Freescale QuadSPI probe failed\n");