1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index c5593526a6e..033ecb45256 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -790,15 +790,12 @@ static int res_get(struct em28xx_fh *fh)
         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;
 }