---

yaml --- r: 331083 b: refs/heads/master c: 8ac4564 h: refs/heads/master i: 331081: 611fcfa 331079: 49f822b v: v3
git-mirror · Sep 25, 2012 · 6a3c43c · 6a3c43c
1 parent 53e66ab
commit 6a3c43c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git 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
@@ -184,16 +184,15 @@ 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 */
 	for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
 		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;