2013-03-28 04:32:00

by Wei Yongjun

Subject: [PATCH -next] mg_disk: fix error return code in mg_probe()

From: Wei Yongjun <[email protected]>

Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/block/mg_disk.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index 532bb89..a56cfcd 100644
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -892,8 +892,10 @@ static int mg_probe(struct platform_device *plat_dev)
gpio_direction_output(host->rst, 1);

/* reset out pin */
- if (!(prv_data->dev_attr & MG_DEV_MASK))
+ if (!(prv_data->dev_attr & MG_DEV_MASK)) {
+ err = -EINVAL;
goto probe_err_3a;
+ }

if (prv_data->dev_attr != MG_BOOT_DEV) {
rsc = platform_get_resource_byname(plat_dev, IORESOURCE_IO,

2013-03-28 04:43:59

by Jingoo Han

Subject: Re: [PATCH -next] mg_disk: fix error return code in mg_probe()

On Thursday, March 28, 2013 1:32 PM, Wei Yongjun wrote:
>
> From: Wei Yongjun <[email protected]>
>
> Fix to return a negative error code from the error handling
> case instead of 0, as returned elsewhere in this function.
>
> Signed-off-by: Wei Yongjun <[email protected]>

CC'ed Jens Axboe

It looks good.
Reviewed-by: Jingoo Han <[email protected]>

Best regards,
Jingoo Han

> ---
> drivers/block/mg_disk.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
> index 532bb89..a56cfcd 100644
> --- a/drivers/block/mg_disk.c
> +++ b/drivers/block/mg_disk.c
> @@ -892,8 +892,10 @@ static int mg_probe(struct platform_device *plat_dev)
> gpio_direction_output(host->rst, 1);
>
> /* reset out pin */
> - if (!(prv_data->dev_attr & MG_DEV_MASK))
> + if (!(prv_data->dev_attr & MG_DEV_MASK)) {
> + err = -EINVAL;
> goto probe_err_3a;
> + }
>
> if (prv_data->dev_attr != MG_BOOT_DEV) {
> rsc = platform_get_resource_byname(plat_dev, IORESOURCE_IO,

2013-03-28 15:44:29

by Jens Axboe

Subject: Re: [PATCH -next] mg_disk: fix error return code in mg_probe()

On Thu, Mar 28 2013, Jingoo Han wrote:
> On Thursday, March 28, 2013 1:32 PM, Wei Yongjun wrote:
> >
> > From: Wei Yongjun <[email protected]>
> >
> > Fix to return a negative error code from the error handling
> > case instead of 0, as returned elsewhere in this function.
> >
> > Signed-off-by: Wei Yongjun <[email protected]>
>
> CC'ed Jens Axboe
>
> It looks good.
> Reviewed-by: Jingoo Han <[email protected]>

Applied, thanks guys.

--
Jens Axboe