From 2a658a1497ba2f7f748aa1ab68ff3c54d2619113 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Wed, 17 Apr 2013 15:03:34 -0300 Subject: [PATCH] --- yaml --- r: 367089 b: refs/heads/master c: 0c2224ee0e480001eab6fd31e7d12b6d80745926 h: refs/heads/master i: 367087: 22daa6a916e3ef4af1f9589e7022220ca1c4b463 v: v3 --- [refs] | 2 +- trunk/drivers/media/i2c/s5c73m3/s5c73m3-core.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 12968a9592ba..0ec1743841f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 068b16b638070611272cf60da821cd70b2a267b3 +refs/heads/master: 0c2224ee0e480001eab6fd31e7d12b6d80745926 diff --git a/trunk/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/trunk/drivers/media/i2c/s5c73m3/s5c73m3-core.c index b353c50a6881..ce8fcf22253a 100644 --- a/trunk/drivers/media/i2c/s5c73m3/s5c73m3-core.c +++ b/trunk/drivers/media/i2c/s5c73m3/s5c73m3-core.c @@ -1668,13 +1668,17 @@ static int s5c73m3_probe(struct i2c_client *client, static int s5c73m3_remove(struct i2c_client *client) { - struct v4l2_subdev *sd = i2c_get_clientdata(client); - struct s5c73m3 *state = sensor_sd_to_s5c73m3(sd); + struct v4l2_subdev *oif_sd = i2c_get_clientdata(client); + struct s5c73m3 *state = oif_sd_to_s5c73m3(oif_sd); + struct v4l2_subdev *sensor_sd = &state->sensor_sd; - v4l2_device_unregister_subdev(sd); + v4l2_device_unregister_subdev(oif_sd); - v4l2_ctrl_handler_free(sd->ctrl_handler); - media_entity_cleanup(&sd->entity); + v4l2_ctrl_handler_free(oif_sd->ctrl_handler); + media_entity_cleanup(&oif_sd->entity); + + v4l2_device_unregister_subdev(sensor_sd); + media_entity_cleanup(&sensor_sd->entity); s5c73m3_unregister_spi_driver(state); s5c73m3_free_gpios(state);