From f7350a034af4531f6df7e66cd5661f0f9a0ec4d6 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Fri, 3 Oct 2014 11:20:37 -0300 Subject: [PATCH] [media] smiapp: Free control handlers in sub-device cleanup Also call smiapp_cleanup() in smiapp_remove(), replacing code that did the same than the function. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/smiapp/smiapp-core.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c index 22eddd6..d0a55fb 100644 --- a/drivers/media/i2c/smiapp/smiapp-core.c +++ b/drivers/media/i2c/smiapp/smiapp-core.c @@ -2522,6 +2522,8 @@ static void smiapp_cleanup(struct smiapp_sensor *sensor) device_remove_file(&client->dev, &dev_attr_nvm); device_remove_file(&client->dev, &dev_attr_ident); + + smiapp_free_controls(sensor); } static int smiapp_init(struct smiapp_sensor *sensor) @@ -3124,15 +3126,11 @@ static int smiapp_remove(struct i2c_client *client) sensor->power_count = 0; } - device_remove_file(&client->dev, &dev_attr_ident); - if (sensor->nvm) - device_remove_file(&client->dev, &dev_attr_nvm); - for (i = 0; i < sensor->ssds_used; i++) { v4l2_device_unregister_subdev(&sensor->ssds[i].sd); media_entity_cleanup(&sensor->ssds[i].sd.entity); } - smiapp_free_controls(sensor); + smiapp_cleanup(sensor); return 0; } -- 2.7.4