media: staging: media: atomisp: Don't abort on error in module exit path

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. Print a warning instead
and free flash unconditionally.

Link: https://lore.kernel.org/linux-media/20200903183145.720727-1-alex.dewar90@gmail.com
Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
index 0ab67b2aec6718543af3f4f79d8da88340163f72..ebe3c618051f26133c010940d9bb87810403f351 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
@@ -783,7 +783,7 @@ static int lm3554_gpio_init(struct i2c_client *client)
        return 0;
 }
 
-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);
@@ -792,13 +792,13 @@ static int lm3554_gpio_uninit(struct i2c_client *client)
 
        ret = gpiod_direction_output(pdata->gpio_strobe, 0);
        if (ret < 0)
-               return ret;
+               dev_err(&client->dev,
+                       "gpio request/direction_output fail for gpio_strobe");
 
        ret = gpiod_direction_output(pdata->gpio_reset, 0);
        if (ret < 0)
-               return ret;
-
-       return 0;
+               dev_err(&client->dev,
+                       "gpio request/direction_output fail for gpio_reset");
 }
 
 static void *lm3554_platform_data_func(struct i2c_client *client)
@@ -914,16 +914,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 = {