2018-03-21 05:39:21

by Arushi Singhal

Subject: [PATCH] mtd: devices: check mtd_device_register() return code

stfsm_probe() misses error handling of mtd_device_register().

Signed-off-by: Arushi Singhal <[email protected]>
---
drivers/mtd/devices/st_spi_fsm.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c
index 7bc29d7..e1aa4f8 100644
--- a/drivers/mtd/devices/st_spi_fsm.c
+++ b/drivers/mtd/devices/st_spi_fsm.c
@@ -2125,7 +2125,13 @@ static int stfsm_probe(struct platform_device *pdev)
(long long)fsm->mtd.size, (long long)(fsm->mtd.size >> 20),
fsm->mtd.erasesize, (fsm->mtd.erasesize >> 10));

- return mtd_device_register(&fsm->mtd, NULL, 0);
+ ret = mtd_device_register(&fsm->mtd, NULL, 0);
+ if (ret) {
+ pr_err("Failed to register device\n");
+ return ret;
+ }
+
+ return 0;

err_clk_unprepare:
clk_disable_unprepare(fsm->clk);
--
2.7.4

2018-03-21 08:02:39

by Miquel Raynal

Subject: Re: [PATCH] mtd: devices: check mtd_device_register() return code

Hi Arushi,

On Wed, 21 Mar 2018 11:07:09 +0530, Arushi Singhal
<[email protected]> wrote:

> stfsm_probe() misses error handling of mtd_device_register().
>
> Signed-off-by: Arushi Singhal <[email protected]>
> ---
> drivers/mtd/devices/st_spi_fsm.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c
> index 7bc29d7..e1aa4f8 100644
> --- a/drivers/mtd/devices/st_spi_fsm.c
> +++ b/drivers/mtd/devices/st_spi_fsm.c
> @@ -2125,7 +2125,13 @@ static int stfsm_probe(struct platform_device *pdev)
> (long long)fsm->mtd.size, (long long)(fsm->mtd.size >> 20),
> fsm->mtd.erasesize, (fsm->mtd.erasesize >> 10));
>
> - return mtd_device_register(&fsm->mtd, NULL, 0);
> + ret = mtd_device_register(&fsm->mtd, NULL, 0);
> + if (ret) {
> + pr_err("Failed to register device\n");
> + return ret;
> + }
> +
> + return 0;

I don't think this bring anything. However, if you want to fix
something you should jump below on error to disable the clock instead
of returning 'ret' directly.

>
> err_clk_unprepare:
> clk_disable_unprepare(fsm->clk);

Thanks,
Miquèl

--
Miquel Raynal, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com