From be7f14eecef7b3b6578e568414f375d6bd45e800 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 5 May 2010 02:58:57 -0300 Subject: [PATCH] --- yaml --- r: 193155 b: refs/heads/master c: 16ee9bb100340f9f775ab334acb645f54642f312 h: refs/heads/master i: 193153: d1fb470bf4b0bb73b4f349e60dbb7309960b76d9 193151: ad505e3f21fb2586c22b1cd0dbafb0f35e3407f4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mem2mem_testdev.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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);