From 6a3c43c658602f98600b7fea154e92deba330560 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Sun, 19 Aug 2012 21:23:46 -0300 Subject: [PATCH] --- yaml --- r: 331083 b: refs/heads/master c: 8ac456495a33d9466076fea94594181ceefb76d9 h: refs/heads/master i: 331081: 611fcfad7a9af6cbcdb9f93b4c4b4f564e08901c 331079: 49f822b9bbd8d7dbf3abeacee51738e124ae4e58 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/stk1160/stk1160-v4l.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a7d5e5706b4e..7f9a9c453e46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6b69c6c58288587c33efb43ca6e19f1c80b2757 +refs/heads/master: 8ac456495a33d9466076fea94594181ceefb76d9 diff --git a/trunk/drivers/media/usb/stk1160/stk1160-v4l.c b/trunk/drivers/media/usb/stk1160/stk1160-v4l.c index 879800dd162f..fe6e857969ca 100644 --- a/trunk/drivers/media/usb/stk1160/stk1160-v4l.c +++ b/trunk/drivers/media/usb/stk1160/stk1160-v4l.c @@ -184,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) - goto out_unlock; + goto out_stop_hw; } /* submit urbs and enables IRQ */ @@ -192,8 +192,7 @@ static int stk1160_start_streaming(struct stk1160 *dev) rc = usb_submit_urb(dev->isoc_ctl.urb[i], GFP_KERNEL); if (rc) { stk1160_err("cannot submit urb[%d] (%d)\n", i, rc); - stk1160_uninit_isoc(dev); - goto out_unlock; + goto out_uninit; } } @@ -206,7 +205,16 @@ static int stk1160_start_streaming(struct stk1160 *dev) stk1160_dbg("streaming started\n"); -out_unlock: + mutex_unlock(&dev->v4l_lock); + + return 0; + +out_uninit: + stk1160_uninit_isoc(dev); +out_stop_hw: + usb_set_interface(dev->udev, 0, 0); + stk1160_clear_queue(dev); + mutex_unlock(&dev->v4l_lock); return rc;