Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c2224ee authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] s5c73m3: Fix remove() callback to free requested resources 



Make sure v4l2_device_unregister_subdev() is called for both:
oif and sensor subdev and both media entities are freed on
driver removal.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 068b16b6

drivers/media/i2c/s5c73m3/s5c73m3-core.c

+9 −5
Original line number Diff line number Diff line
@@ -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);