diff options
Diffstat (limited to 'drivers/media/radio/radio-wl1273.c')
| -rw-r--r-- | drivers/media/radio/radio-wl1273.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c index 484046471c03..e8166eac9efe 100644 --- a/drivers/media/radio/radio-wl1273.c +++ b/drivers/media/radio/radio-wl1273.c @@ -1977,7 +1977,7 @@ static const struct video_device wl1273_viddev_template = { V4L2_CAP_RDS_OUTPUT, }; -static int wl1273_fm_radio_remove(struct platform_device *pdev) +static void wl1273_fm_radio_remove(struct platform_device *pdev) { struct wl1273_device *radio = platform_get_drvdata(pdev); struct wl1273_core *core = radio->core; @@ -1990,8 +1990,6 @@ static int wl1273_fm_radio_remove(struct platform_device *pdev) v4l2_ctrl_handler_free(&radio->ctrl_handler); video_unregister_device(&radio->videodev); v4l2_device_unregister(&radio->v4l2dev); - - return 0; } static int wl1273_fm_radio_probe(struct platform_device *pdev) @@ -2147,7 +2145,7 @@ pdata_err: static struct platform_driver wl1273_fm_radio_driver = { .probe = wl1273_fm_radio_probe, - .remove = wl1273_fm_radio_remove, + .remove_new = wl1273_fm_radio_remove, .driver = { .name = "wl1273_fm_radio", }, |