1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
index 675348a06a39..8bbc905b26c8 100644
--- a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
+++ b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
@@ -482,10 +482,12 @@ static int rockchip_vpu_probe(struct platform_device *pdev)
         return 0;
 err_video_dev_unreg:
         if (vpu->vfd_enc) {
+                v4l2_m2m_unregister_media_controller(vpu->m2m_dev);
                 video_unregister_device(vpu->vfd_enc);
                 video_device_release(vpu->vfd_enc);
         }
 err_m2m_rel:
+        media_device_cleanup(&vpu->mdev);
         v4l2_m2m_release(vpu->m2m_dev);
 err_v4l2_unreg:
         v4l2_device_unregister(&vpu->v4l2_dev);
@@ -503,13 +505,13 @@ static int rockchip_vpu_remove(struct platform_device *pdev)
         v4l2_info(&vpu->v4l2_dev, "Removing %s\n", pdev->name);
 
         media_device_unregister(&vpu->mdev);
-        v4l2_m2m_unregister_media_controller(vpu->m2m_dev);
-        v4l2_m2m_release(vpu->m2m_dev);
-        media_device_cleanup(&vpu->mdev);
         if (vpu->vfd_enc) {
+                v4l2_m2m_unregister_media_controller(vpu->m2m_dev);
                 video_unregister_device(vpu->vfd_enc);
                 video_device_release(vpu->vfd_enc);
         }
+        media_device_cleanup(&vpu->mdev);
+        v4l2_m2m_release(vpu->m2m_dev);
         v4l2_device_unregister(&vpu->v4l2_dev);
         clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);
         pm_runtime_dont_use_autosuspend(vpu->dev);