diff options
Diffstat (limited to 'drivers/media/platform/ti/davinci/vpif_capture.c')
| -rw-r--r-- | drivers/media/platform/ti/davinci/vpif_capture.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/platform/ti/davinci/vpif_capture.c b/drivers/media/platform/ti/davinci/vpif_capture.c index 580723333fcc..44d269d6038c 100644 --- a/drivers/media/platform/ti/davinci/vpif_capture.c +++ b/drivers/media/platform/ti/davinci/vpif_capture.c @@ -1714,7 +1714,7 @@ cleanup: * * The vidoe device is unregistered */ -static int vpif_remove(struct platform_device *device) +static void vpif_remove(struct platform_device *device) { struct channel_obj *ch; int i; @@ -1732,7 +1732,6 @@ static int vpif_remove(struct platform_device *device) video_unregister_device(&ch->video_dev); kfree(vpif_obj.dev[i]); } - return 0; } #ifdef CONFIG_PM_SLEEP @@ -1815,7 +1814,7 @@ static __refdata struct platform_driver vpif_driver = { .pm = &vpif_pm_ops, }, .probe = vpif_probe, - .remove = vpif_remove, + .remove_new = vpif_remove, }; module_platform_driver(vpif_driver); |