diff options
Diffstat (limited to 'drivers/staging/media/rkvdec/rkvdec.c')
| -rw-r--r-- | drivers/staging/media/rkvdec/rkvdec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index 7bab7586918c..134e2b9fa7d9 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -1062,14 +1062,15 @@ err_disable_runtime_pm: return ret; } -static int rkvdec_remove(struct platform_device *pdev) +static void rkvdec_remove(struct platform_device *pdev) { struct rkvdec_dev *rkvdec = platform_get_drvdata(pdev); + cancel_delayed_work_sync(&rkvdec->watchdog_work); + rkvdec_v4l2_cleanup(rkvdec); pm_runtime_disable(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); - return 0; } #ifdef CONFIG_PM @@ -1099,7 +1100,7 @@ static const struct dev_pm_ops rkvdec_pm_ops = { static struct platform_driver rkvdec_driver = { .probe = rkvdec_probe, - .remove = rkvdec_remove, + .remove_new = rkvdec_remove, .driver = { .name = "rkvdec", .of_match_table = of_rkvdec_match, |