Hi Jonghwan,
Jonghwan Choi <jhbird.choi@xxxxxxxxxxx> writes:
> This patch looks like it should be in the 3.9-stable tree, should we apply
> it?
I'm queuing this patch to the 3.5 kernel as well, as it looks like it
is also applicable.
Cheers,
--
Luis
>
> ------------------
>
> From: "Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>"
>
> commit 3b813798aa7030f1beef638c75f8b0008f737a82 upstream
>
> Fix to return -EINVAL in the i2c device found error handling
> case instead of 0, as done elsewhere in this function.
> And also correct the fail1 and fail2 lable to do the right thing.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
> Signed-off-by: Jonathan Cameron <jic23@xxxxxxxxxx>
> Signed-off-by: Jonghwan Choi <jhbird.choi@xxxxxxxxxxx>
> ---
> drivers/staging/iio/light/tsl2x7x_core.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/iio/light/tsl2x7x_core.c
> b/drivers/staging/iio/light/tsl2x7x_core.c
> index a58731e..2d40c03 100644
> --- a/drivers/staging/iio/light/tsl2x7x_core.c
> +++ b/drivers/staging/iio/light/tsl2x7x_core.c
> @@ -1869,6 +1869,7 @@ static int tsl2x7x_probe(struct i2c_client *clientp,
> dev_info(&chip->client->dev,
> "%s: i2c device found does not match
> expected id\n",
> __func__);
> + ret = -EINVAL;
> goto fail1;
> }
>
> @@ -1907,7 +1908,7 @@ static int tsl2x7x_probe(struct i2c_client *clientp,
> if (ret) {
> dev_err(&clientp->dev,
> "%s: irq request failed", __func__);
> - goto fail2;
> + goto fail1;
> }
> }
>
> @@ -1920,17 +1921,17 @@ static int tsl2x7x_probe(struct i2c_client *clientp,
> if (ret) {
> dev_err(&clientp->dev,
> "%s: iio registration failed\n", __func__);
> - goto fail1;
> + goto fail2;
> }
>
> dev_info(&clientp->dev, "%s Light sensor found.\n", id->name);
>
> return 0;
>
> -fail1:
> +fail2:
> if (clientp->irq)
> free_irq(clientp->irq, indio_dev);
> -fail2:
> +fail1:
> iio_device_free(indio_dev);
>
> return ret;
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html