diff --git a/[refs] b/[refs] index e71e3466900e..a161ef090eab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac0fe5ba7f2b81a0bc4a7b97455d26e127875393 +refs/heads/master: b7e13ef7e61f19ecf0b5d4b7d2483ae7b9f15513 diff --git a/trunk/drivers/media/platform/mem2mem_testdev.c b/trunk/drivers/media/platform/mem2mem_testdev.c index d03637537118..43395dfa20ee 100644 --- a/trunk/drivers/media/platform/mem2mem_testdev.c +++ b/trunk/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);