From e6feef10305f7a727915983b690ec9314e598b11 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 14 Aug 2012 02:58:56 -0300 Subject: [PATCH] --- yaml --- r: 330881 b: refs/heads/master c: a7bd775628006f7da1b94d7a5def6746f55f2321 h: refs/heads/master i: 330879: 82039017d11536bc2675307f46a71aad84308d04 v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/mem2mem_testdev.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7519033af45d..68b9bec0ea0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e36c92fd63bb4773e6f4bc38ecee11a609ded1cf +refs/heads/master: a7bd775628006f7da1b94d7a5def6746f55f2321 diff --git a/trunk/drivers/media/platform/mem2mem_testdev.c b/trunk/drivers/media/platform/mem2mem_testdev.c index 6d0d2fb11bbe..51b6dd4ddbf7 100644 --- a/trunk/drivers/media/platform/mem2mem_testdev.c +++ b/trunk/drivers/media/platform/mem2mem_testdev.c @@ -911,10 +911,9 @@ static int m2mtest_open(struct file *file) v4l2_ctrl_new_custom(hdl, &m2mtest_ctrl_trans_time_msec, NULL); v4l2_ctrl_new_custom(hdl, &m2mtest_ctrl_trans_num_bufs, NULL); if (hdl->error) { - int err = hdl->error; - + rc = hdl->error; v4l2_ctrl_handler_free(hdl); - return err; + goto open_unlock; } ctx->fh.ctrl_handler = hdl; v4l2_ctrl_handler_setup(hdl); @@ -946,7 +945,7 @@ static int m2mtest_open(struct file *file) open_unlock: mutex_unlock(&dev->dev_mutex); - return 0; + return rc; } static int m2mtest_release(struct file *file)