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

Commit 4a1a3d75 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "radio: RTC6226: correctly cleanup videodev"

parents b7cf7a30 1339fc5a

drivers/media/radio/rtc6226/radio-rtc6226-i2c.c

+4 −3
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ static int rtc6226_i2c_probe(struct i2c_client *client, 
err_rds:

	kfree(radio->buffer);

err:

	video_device_release(&radio->videodev);

	video_device_release_empty(&radio->videodev);

err_v4l2:

	v4l2_device_unregister(v4l2_dev);

err_vreg:
@@ -920,9 +920,10 @@ static int rtc6226_i2c_remove(struct i2c_client *client) 


	free_irq(client->irq, radio);

	kfree(radio->buffer);

	video_device_release(&radio->videodev);

	v4l2_ctrl_handler_free(&radio->ctrl_handler);

	if (video_is_registered(&radio->videodev))

		video_unregister_device(&radio->videodev);

	video_device_release_empty(&radio->videodev);

	v4l2_device_unregister(&radio->v4l2_dev);

	kfree(radio);

	FMDBG("%s exit\n", __func__);