commit e74153d44a57d9445fb1dfad7c3accbec6d4a873
author Mauro Carvalho Chehab <mchehab@infradead.org> Sun Apr 13 14:55:38 2008 -0300
committer Mauro Carvalho Chehab <mchehab@infradead.org> Thu Apr 24 14:08:10 2008 -0300
tree f8fe30f6751860b7e28a0011f639128803442e9a
parent f245e549f0d1fb43fd6d7759d31cd763e6d914b6

V4L/DVB (7547): em28xx: Fix a broken lock

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

drivers/media/video/em28xx/em28xx-video.c

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index c559352..033ecb4 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -790,15 +790,12 @@
 	if (fh->stream_on)
 		return rc;
 
-	mutex_lock(&dev->lock);
-
 	if (dev->stream_on)
-		rc = -EINVAL;
-	else {
-		dev->stream_on = 1;
-		fh->stream_on  = 1;
-	}
+		return -EINVAL;
 
+	mutex_lock(&dev->lock);
+	dev->stream_on = 1;
+	fh->stream_on  = 1;
 	mutex_unlock(&dev->lock);
 	return rc;
 }