| Message ID | 1500339248-18132-1-git-send-email-festevam@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Boris Brezillon |
| Headers | show |
On Mon, 17 Jul 2017 21:54:07 -0300 Fabio Estevam <festevam@gmail.com> wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > clk_prepare_enable() may fail, so we should better check its return value > and propagate it in the case of error. > Applied both. Thanks, Boris > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > Changes since v1: > - None > > drivers/mtd/nand/vf610_nfc.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c > index 744ab10..9e49672 100644 > --- a/drivers/mtd/nand/vf610_nfc.c > +++ b/drivers/mtd/nand/vf610_nfc.c > @@ -814,12 +814,16 @@ static int vf610_nfc_suspend(struct device *dev) > > static int vf610_nfc_resume(struct device *dev) > { > + int err; > + > struct mtd_info *mtd = dev_get_drvdata(dev); > struct vf610_nfc *nfc = mtd_to_nfc(mtd); > > pinctrl_pm_select_default_state(dev); > > - clk_prepare_enable(nfc->clk); > + err = clk_prepare_enable(nfc->clk); > + if (err) > + return err; > > vf610_nfc_preinit_controller(nfc); > vf610_nfc_init_controller(nfc);
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c index 744ab10..9e49672 100644 --- a/drivers/mtd/nand/vf610_nfc.c +++ b/drivers/mtd/nand/vf610_nfc.c @@ -814,12 +814,16 @@ static int vf610_nfc_suspend(struct device *dev) static int vf610_nfc_resume(struct device *dev) { + int err; + struct mtd_info *mtd = dev_get_drvdata(dev); struct vf610_nfc *nfc = mtd_to_nfc(mtd); pinctrl_pm_select_default_state(dev); - clk_prepare_enable(nfc->clk); + err = clk_prepare_enable(nfc->clk); + if (err) + return err; vf610_nfc_preinit_controller(nfc); vf610_nfc_init_controller(nfc);