[PATCH REBASE 3/3] staging: media: atomisp: Don't abort on error in module exit path

[Alex Dewar]

The function lm3554_remove() checks for the return code for
lm3554_gpio_uninit() even though this is on the exit path and exits the
function, leaving the variable flash unfreed. Instead, print a warning and
free flash unconditionally.

Signed-off-by: Alex Dewar <alex.dewa...@gmail.com>
---
 .../staging/media/atomisp/i2c/atomisp-lm3554.c  | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c 
b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
index 5e895586e80a..84c47c1f9eb4 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
@@ -794,7 +794,7 @@ static int lm3554_gpio_init(struct i2c_client *client)
        return ret;
 }
 
-static int lm3554_gpio_uninit(struct i2c_client *client)
+static void lm3554_gpio_uninit(struct i2c_client *client)
 {
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct lm3554 *flash = to_lm3554(sd);
@@ -803,15 +803,16 @@ static int lm3554_gpio_uninit(struct i2c_client *client)
 
        ret = gpio_direction_output(pdata->gpio_strobe, 0);
        if (ret < 0)
-               return ret;
+               dev_err(&client->dev,
+                       "gpio request/direction_output fail for gpio_strobe");
 
        ret = gpio_direction_output(pdata->gpio_reset, 0);
        if (ret < 0)
-               return ret;
+               dev_err(&client->dev,
+                       "gpio request/direction_output fail for gpio_reset");
 
        gpio_free(pdata->gpio_strobe);
        gpio_free(pdata->gpio_reset);
-       return 0;
 }
 
 static void *lm3554_platform_data_func(struct i2c_client *client)
@@ -918,7 +919,6 @@ static int lm3554_remove(struct i2c_client *client)
 {
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct lm3554 *flash = to_lm3554(sd);
-       int ret;
 
        media_entity_cleanup(&flash->sd.entity);
        v4l2_ctrl_handler_free(&flash->ctrl_handler);
@@ -928,16 +928,11 @@ static int lm3554_remove(struct i2c_client *client)
 
        del_timer_sync(&flash->flash_off_delay);
 
-       ret = lm3554_gpio_uninit(client);
-       if (ret < 0)
-               goto fail;
+       lm3554_gpio_uninit(client);
 
        kfree(flash);
 
        return 0;
-fail:
-       dev_err(&client->dev, "gpio request/direction_output fail");
-       return ret;
 }
 
 static const struct dev_pm_ops lm3554_pm_ops = {
-- 
2.28.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel