summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Francois Moine2009-11-13 11:15:08 +0100
committerMauro Carvalho Chehab2009-12-05 21:41:58 +0100
commit8157852f73f961b28d495bfa8374263d293b106d (patch)
treef232c227fbb0938ecd12eb94c6cf7568a5d6292d
parentV4L/DVB (13449): gspca - ov534: The AWB control works only when autogain is set. (diff)
downloadkernel-qcow2-linux-8157852f73f961b28d495bfa8374263d293b106d.tar.gz
kernel-qcow2-linux-8157852f73f961b28d495bfa8374263d293b106d.tar.xz
kernel-qcow2-linux-8157852f73f961b28d495bfa8374263d293b106d.zip
V4L/DVB (13450): gspca - main: Clear the urb status before resubmit.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/gspca/gspca.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 369eddd352c3..08433f77245a 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -139,6 +139,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
return;
#endif
PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
+ urb->status = 0;
goto resubmit;
}
pkt_scan = gspca_dev->sd_desc->pkt_scan;
@@ -214,15 +215,13 @@ static void bulk_irq(struct urb *urb)
break;
case -ESHUTDOWN:
return; /* disconnection */
- case -ECONNRESET:
- urb->status = 0;
- break;
default:
#ifdef CONFIG_PM
if (gspca_dev->frozen)
return;
#endif
PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
+ urb->status = 0;
goto resubmit;
}