From 56adb41979ffe708936e27b03cf1f44660fe20d5 Mon Sep 17 00:00:00 2001
From: Frank Schaefer <fschaefer.oss@googlemail.com>
Date: Thu, 8 Nov 2012 14:11:43 -0300
Subject: [PATCH] --- yaml --- r: 357132 b: refs/heads/master c:
 337fe8dad58692ac468f4139ea19624ce464d953 h: refs/heads/master v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/media/usb/em28xx/em28xx-core.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f764abd05cd5..bfe78ab8173c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 057ca0da067c8c0c734088eba229ab06e21bc88c
+refs/heads/master: 337fe8dad58692ac468f4139ea19624ce464d953
diff --git a/trunk/drivers/media/usb/em28xx/em28xx-core.c b/trunk/drivers/media/usb/em28xx/em28xx-core.c
index d8a8e8bbb870..6b3485d2266a 100644
--- a/trunk/drivers/media/usb/em28xx/em28xx-core.c
+++ b/trunk/drivers/media/usb/em28xx/em28xx-core.c
@@ -1174,6 +1174,16 @@ int em28xx_init_usb_xfer(struct em28xx *dev, enum em28xx_mode mode,
 			return rc;
 	}
 
+	if (xfer_bulk) {
+		rc = usb_clear_halt(dev->udev, usb_bufs->urb[0]->pipe);
+		if (rc < 0) {
+			em28xx_err("failed to clear USB bulk endpoint stall/halt condition (error=%i)\n",
+				   rc);
+			em28xx_uninit_usb_xfer(dev, mode);
+			return rc;
+		}
+	}
+
 	init_waitqueue_head(&dma_q->wq);
 	init_waitqueue_head(&vbi_dma_q->wq);