This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/media_tree.git tree:

Subject: [media] stk1160: unlock on error path stk1160_set_alternate()
Author:  Dan Carpenter <[email protected]>
Date:    Tue Aug 14 02:59:48 2012 -0300

There are some unlocks missing on error.

Signed-off-by: Dan Carpenter <[email protected]>
Acked-by: Ezequiel Garcia <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/usb/stk1160/stk1160-v4l.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

---

http://git.linuxtv.org/media_tree.git?a=commitdiff;h=f367cc1efebdfacfca083e55fdeafa0163054995

diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c 
b/drivers/media/usb/stk1160/stk1160-v4l.c
index 360bdbe..1ad4ac1 100644
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -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 */

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to