1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c
index d03637537118..2e2121e98133 100644
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/mem2mem_testdev.c
@@ -397,8 +397,7 @@ static void device_isr(unsigned long priv)
         curr_ctx = v4l2_m2m_get_curr_priv(m2mtest_dev->m2m_dev);
 
         if (NULL == curr_ctx) {
-                printk(KERN_ERR
-                        "Instance released before the end of transaction\n");
+                pr_err("Instance released before the end of transaction\n");
                 return;
         }
 
@@ -894,7 +893,7 @@ static int m2mtest_open(struct file *file)
 
         if (mutex_lock_interruptible(&dev->dev_mutex))
                 return -ERESTARTSYS;
-        ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
+        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
         if (!ctx) {
                 rc = -ENOMEM;
                 goto open_unlock;
@@ -1020,7 +1019,7 @@ static int m2mtest_probe(struct platform_device *pdev)
         struct video_device *vfd;
         int ret;
 
-        dev = kzalloc(sizeof *dev, GFP_KERNEL);
+        dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
         if (!dev)
                 return -ENOMEM;
 
@@ -1028,7 +1027,7 @@ static int m2mtest_probe(struct platform_device *pdev)
 
         ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
         if (ret)
-                goto free_dev;
+                return ret;
 
         atomic_set(&dev->num_inst, 0);
         mutex_init(&dev->dev_mutex);
@@ -1067,15 +1066,13 @@ static int m2mtest_probe(struct platform_device *pdev)
 
         return 0;
 
-        v4l2_m2m_release(dev->m2m_dev);
 err_m2m:
+        v4l2_m2m_release(dev->m2m_dev);
         video_unregister_device(dev->vfd);
 rel_vdev:
         video_device_release(vfd);
 unreg_dev:
         v4l2_device_unregister(&dev->v4l2_dev);
-free_dev:
-        kfree(dev);
 
         return ret;
 }
@@ -1090,7 +1087,6 @@ static int m2mtest_remove(struct platform_device *pdev)
         del_timer_sync(&dev->timer);
         video_unregister_device(dev->vfd);
         v4l2_device_unregister(&dev->v4l2_dev);
-        kfree(dev);
 
         return 0;
 }