lkml.org 
[lkml]   [2016]   [Aug]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] mfd: arizona: Add sensible return value to some error paths
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

\
 
 \ /
  Last update: 2016-09-17 09:58    [W:0.067 / U:1.724 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site