staging: media: atomisp: Don't abort on error in module exit path
Subsystems (4)
PATCH 1/2 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.
Signed-off-by Alex Dewar <[email protected]>
--- .../staging/media/atomisp/i2c/atomisp-lm3554.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +6 -11
@@ -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)
@@ -918,16 +918,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 = {
Signature · 1 line
2.28.0
PATCH 2/2 staging: media: atomisp: Remove unhelpful info message
We don't really need to know that the LED pin reset successfully.
Signed-off-by Alex Dewar <[email protected]>
--- drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +0 -1
@@ -771,7 +771,6 @@ static int lm3554_gpio_init(struct i2c_client *client) ret =gpiod_direction_output (pdata->gpio_reset,0 );if (ret <0 )return ret; -dev_info (&client->dev,"flash led reset successfully\n" );if (!pdata->gpio_strobe)return -EINVAL ;
Signature · 1 line
2.28.0
Re: [PATCH 2/2] staging: media: atomisp: Remove unhelpful info message
Quoted 1 line · Alex Dewar
We don't really need to know that the LED pin reset successfully.
Ping?
Quoted 18 lines
Signed-off-by Alex Dewar <[email protected]>--- drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 1 - 1 file changed, 1 deletion(-)drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +0
-1@@ -771,7 +771,6 @@ static int lm3554_gpio_init(struct i2c_client *client) ret =gpiod_direction_output (pdata->gpio_reset,0 );if (ret <0 )return ret; -dev_info (&client->dev,"flash led reset successfully\n" );if (!pdata->gpio_strobe)return -EINVAL ;