[media] stk1160: unlock on error path stk1160_set_alternate()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 14 Aug 2012 05:59:48 +0000 (02:59 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 15 Aug 2012 21:52:13 +0000 (18:52 -0300)
There are some unlocks missing on error.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/stk1160/stk1160-v4l.c

index 360bdbee4270d9db431ef8f262654a9f5d0c473b..1ad4ac1877273193e6e52cafb8efa72109a8f5ba 100644 (file)
@@ -159,8 +159,9 @@ static bool stk1160_set_alternate(struct stk1160 *dev)
 
 static int stk1160_start_streaming(struct stk1160 *dev)
 {
-       int i, rc;
        bool new_pkt_size;
+       int rc = 0;
+       int i;
 
        /* Check device presence */
        if (!dev->udev)
@@ -183,7 +184,7 @@ static int stk1160_start_streaming(struct stk1160 *dev)
        if (!dev->isoc_ctl.num_bufs || new_pkt_size) {
                rc = stk1160_alloc_isoc(dev);
                if (rc < 0)
-                       return rc;
+                       goto out_unlock;
        }
 
        /* submit urbs and enables IRQ */
@@ -192,7 +193,7 @@ static int stk1160_start_streaming(struct stk1160 *dev)
                if (rc) {
                        stk1160_err("cannot submit urb[%d] (%d)\n", i, rc);
                        stk1160_uninit_isoc(dev);
-                       return rc;
+                       goto out_unlock;
                }
        }
 
@@ -205,9 +206,10 @@ static int stk1160_start_streaming(struct stk1160 *dev)
 
        stk1160_dbg("streaming started\n");
 
+out_unlock:
        mutex_unlock(&dev->v4l_lock);
 
-       return 0;
+       return rc;
 }
 
 /* Must be called with v4l_lock hold */