summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-11-18 08:19:52 +0100
committerJean-Francois Moine <moinejf@free.fr>2008-11-18 08:19:52 +0100
commit47b954968656ce2ddac212e3750a135a4b1aa581 (patch)
treea39e63f1cf1534a1bf55008c33ba4ecb60b4d12e /linux/drivers/media/video/gspca
parent950febeb0e11d8b6ff554e5c671a6c0d906731e8 (diff)
downloadmediapointer-dvb-s2-47b954968656ce2ddac212e3750a135a4b1aa581.tar.gz
mediapointer-dvb-s2-47b954968656ce2ddac212e3750a135a4b1aa581.tar.bz2
gspca: Reset the bulk URB status before resubmitting at irq level.
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media/video/gspca')
-rw-r--r--linux/drivers/media/video/gspca/gspca.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c
index 1d54a7dce..5197ccadd 100644
--- a/linux/drivers/media/video/gspca/gspca.c
+++ b/linux/drivers/media/video/gspca/gspca.c
@@ -177,7 +177,6 @@ static void fill_frame(struct gspca_dev *gspca_dev,
}
/* resubmit the URB */
- urb->status = 0;
st = usb_submit_urb(urb, GFP_ATOMIC);
if (st < 0)
PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
@@ -218,7 +217,13 @@ static void bulk_irq(struct urb *urb
PDEBUG(D_PACK, "bulk irq");
if (!gspca_dev->streaming)
return;
- if (urb->status != 0 && urb->status != -ECONNRESET) {
+ switch (urb->status) {
+ case 0:
+ break;
+ case -ECONNRESET:
+ urb->status = 0;
+ break;
+ default:
#ifdef CONFIG_PM
if (!gspca_dev->frozen)
#endif