From 09bf39d3002ce3834e18c88f4759decf91e0b664 Mon Sep 17 00:00:00 2001
From: Alexander Strakh <cromlehg@gmail.com>
Date: Tue, 25 Jan 2011 18:00:13 -0300
Subject: [PATCH] --- yaml --- r: 242106 b: refs/heads/master c:
 a07500ef690fcbec76e879ee2093d7ca69883825 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/tlg2300/pd-video.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 82b8bf1b8e01..4fd33cf34243 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 868e90d55c0eb6f3c5949c2a747714072c3e080a
+refs/heads/master: a07500ef690fcbec76e879ee2093d7ca69883825
diff --git a/trunk/drivers/media/video/tlg2300/pd-video.c b/trunk/drivers/media/video/tlg2300/pd-video.c
index df33a1d188bb..a794ae62aebf 100644
--- a/trunk/drivers/media/video/tlg2300/pd-video.c
+++ b/trunk/drivers/media/video/tlg2300/pd-video.c
@@ -764,10 +764,8 @@ static int pd_vidioc_s_fmt(struct poseidon *pd, struct v4l2_pix_format *pix)
 	}
 	ret |= send_set_req(pd, VIDEO_ROSOLU_SEL,
 				vid_resol, &cmd_status);
-	if (ret || cmd_status) {
-		mutex_unlock(&pd->lock);
+	if (ret || cmd_status)
 		return -EBUSY;
-	}
 
 	pix_def->pixelformat = pix->pixelformat; /* save it */
 	pix->height = (context->tvnormid & V4L2_STD_525_60) ?  480 : 576;