diff --git a/[refs] b/[refs]
index 10b342cdafb2..00402fe96e23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7b39036cfd1d3f868a6745e40bc99b2a8650bad
+refs/heads/master: 16ee9bb100340f9f775ab334acb645f54642f312
diff --git a/trunk/drivers/media/video/mem2mem_testdev.c b/trunk/drivers/media/video/mem2mem_testdev.c
index baf211b9f6ce..b161d26b0ddf 100644
--- a/trunk/drivers/media/video/mem2mem_testdev.c
+++ b/trunk/drivers/media/video/mem2mem_testdev.c
@@ -871,8 +871,10 @@ static int m2mtest_open(struct file *file)
 
 	ctx->m2m_ctx = v4l2_m2m_ctx_init(ctx, dev->m2m_dev, queue_init);
 	if (IS_ERR(ctx->m2m_ctx)) {
+		int ret = PTR_ERR(ctx->m2m_ctx);
+
 		kfree(ctx);
-		return PTR_ERR(ctx->m2m_ctx);
+		return ret;
 	}
 
 	atomic_inc(&dev->num_inst);