summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-09-24 02:17:45 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-06 11:50:51 -0300
commitb7e13ef7e61f19ecf0b5d4b7d2483ae7b9f15513 (patch)
tree57e77d4c258fcc370d0415a9e942c08c9107fc4a /drivers/media
parentac0fe5ba7f2b81a0bc4a7b97455d26e127875393 (diff)
downloadblackbird-obmc-linux-b7e13ef7e61f19ecf0b5d4b7d2483ae7b9f15513.tar.gz
blackbird-obmc-linux-b7e13ef7e61f19ecf0b5d4b7d2483ae7b9f15513.zip
[media] mem2mem_testdev: Fix incorrect location of v4l2_m2m_release()
v4l2_m2m_release() was placed after the return statement and outside any of the goto labels and hence was not getting executed under the error exit path. This patch moves it under the exit path label. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/mem2mem_testdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c
index d03637537118..43395dfa20ee 100644
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/mem2mem_testdev.c
@@ -1067,8 +1067,8 @@ 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);
OpenPOWER on IntegriCloud