| Message ID | 20190710114243.30101-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3da9834d9381dd99273f2ad4e6d096c9187dc4f2 |
| Headers | show |
| Series | [v1] spi: dw-mmio: Clock should be shut when error occurs | expand |
Hi Andy, Thanks for the patch. On Wed, Jul 10, 2019 at 12:43 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > When optional clock requesting fails, the main clock is still up and running, we > should shut it down in such caee. s/caee/case for the typo. > > Fixes: 560ee7e91009 ("spi: dw: Add support for an optional interface clock") > Cc: Phil Edworthy <phil.edworthy@renesas.com> > Cc: Gareth Williams <gareth.williams.jx@renesas.com> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/spi/spi-dw-mmio.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index > 1c1cac92a9de..4fa7e7a52ebd 100644 > --- a/drivers/spi/spi-dw-mmio.c > +++ b/drivers/spi/spi-dw-mmio.c > @@ -170,8 +170,10 @@ static int dw_spi_mmio_probe(struct > platform_device *pdev) > > /* Optional clock needed to access the registers */ > dwsmmio->pclk = devm_clk_get_optional(&pdev->dev, "pclk"); > - if (IS_ERR(dwsmmio->pclk)) > - return PTR_ERR(dwsmmio->pclk); > + if (IS_ERR(dwsmmio->pclk)) { > + ret = PTR_ERR(dwsmmio->pclk); > + goto out_clk; > + } > ret = clk_prepare_enable(dwsmmio->pclk); > if (ret) > goto out_clk; > -- > 2.20.1 With the above corrected: Reviewed-by: Gareth Williams <gareth.williams.jx@renesas.com> Kind Regards, Gareth Williams
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index 1c1cac92a9de..4fa7e7a52ebd 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -170,8 +170,10 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) /* Optional clock needed to access the registers */ dwsmmio->pclk = devm_clk_get_optional(&pdev->dev, "pclk"); - if (IS_ERR(dwsmmio->pclk)) - return PTR_ERR(dwsmmio->pclk); + if (IS_ERR(dwsmmio->pclk)) { + ret = PTR_ERR(dwsmmio->pclk); + goto out_clk; + } ret = clk_prepare_enable(dwsmmio->pclk); if (ret) goto out_clk;
When optional clock requesting fails, the main clock is still up and running, we should shut it down in such caee. Fixes: 560ee7e91009 ("spi: dw: Add support for an optional interface clock") Cc: Phil Edworthy <phil.edworthy@renesas.com> Cc: Gareth Williams <gareth.williams.jx@renesas.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/spi/spi-dw-mmio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)