[PATCH] mfd: arizona: Add sensible return value to some error paths

[PATCH] mfd: arizona: Add sensible return value to some error paths

[Charles Keepax]

There are some cases in arizona_dev_init, such as where we don't
recognise the chip ID, in which we head to the error path without
setting a sensible error code in ret. This would lead to the chip
silently failing probe, as it would still return 0. Fix this up by
adding appropriate sets of the return value.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 drivers/mfd/arizona-core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index e4f97b3..34a2c26 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -1121,6 +1121,7 @@ int arizona_dev_init(struct arizona *arizona)
 		break;
 	default:
 		dev_err(arizona->dev, "Unknown device ID: %x\n", reg);
+		ret = -EINVAL;
 		goto err_reset;
 	}
 
@@ -1280,12 +1281,14 @@ int arizona_dev_init(struct arizona *arizona)
 		break;
 	default:
 		dev_err(arizona->dev, "Unknown device ID %x\n", reg);
+		ret = -EINVAL;
 		goto err_reset;
 	}
 
 	if (!subdevs) {
 		dev_err(arizona->dev,
 			"No kernel support for device ID %x\n", reg);
+		ret = -EINVAL;
 		goto err_reset;
 	}
 
-- 
2.1.4

Re: [PATCH] mfd: arizona: Add sensible return value to some error paths

[Lee Jones]

On Fri, 12 Aug 2016, Charles Keepax wrote:

> There are some cases in arizona_dev_init, such as where we don't
> recognise the chip ID, in which we head to the error path without
> setting a sensible error code in ret. This would lead to the chip
> silently failing probe, as it would still return 0. Fix this up by
> adding appropriate sets of the return value.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
>  drivers/mfd/arizona-core.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index e4f97b3..34a2c26 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -1121,6 +1121,7 @@ int arizona_dev_init(struct arizona *arizona)
>  		break;
>  	default:
>  		dev_err(arizona->dev, "Unknown device ID: %x\n", reg);
> +		ret = -EINVAL;

-EINVAL doesn't seem right here.

-ENODEV perhaps?

>  		goto err_reset;
>  	}
>  
> @@ -1280,12 +1281,14 @@ int arizona_dev_init(struct arizona *arizona)
>  		break;
>  	default:
>  		dev_err(arizona->dev, "Unknown device ID %x\n", reg);
> +		ret = -EINVAL;
>  		goto err_reset;
>  	}
>  
>  	if (!subdevs) {
>  		dev_err(arizona->dev,
>  			"No kernel support for device ID %x\n", reg);
> +		ret = -EINVAL;
>  		goto err_reset;
>  	}
>  

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH] mfd: arizona: Add sensible return value to some error paths

[Charles Keepax]

On Wed, Aug 31, 2016 at 09:43:27AM +0100, Lee Jones wrote:
> On Fri, 12 Aug 2016, Charles Keepax wrote:
> 
> > There are some cases in arizona_dev_init, such as where we don't
> > recognise the chip ID, in which we head to the error path without
> > setting a sensible error code in ret. This would lead to the chip
> > silently failing probe, as it would still return 0. Fix this up by
> > adding appropriate sets of the return value.
> > 
> > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> > ---
> >  drivers/mfd/arizona-core.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> > index e4f97b3..34a2c26 100644
> > --- a/drivers/mfd/arizona-core.c
> > +++ b/drivers/mfd/arizona-core.c
> > @@ -1121,6 +1121,7 @@ int arizona_dev_init(struct arizona *arizona)
> >  		break;
> >  	default:
> >  		dev_err(arizona->dev, "Unknown device ID: %x\n", reg);
> > +		ret = -EINVAL;
> 
> -EINVAL doesn't seem right here.
> 
> -ENODEV perhaps?
> 

Yeah that does seem better, I will fire out another version.

Thanks,
Charles