aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/gspca.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-11-18 02:19:52 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:38 -0500
commit880ae24d35d357037d5ad5c3148383fde1070a12 (patch)
treec390fe1a6812d60e0ad9d50035f63a7a59936149 /drivers/media/video/gspca/gspca.c
parent9a23f5fcb0d38ebb70ab31c16c079f38b26e453c (diff)
V4L/DVB (9688): gspca: Reset the bulk URB status before resubmitting at irq level.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/gspca.c')
-rw-r--r--drivers/media/video/gspca/gspca.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index a9a4a5fe4b1..1da7a5c6a9a 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -173,7 +173,6 @@ static void fill_frame(struct gspca_dev *gspca_dev,
173 } 173 }
174 174
175 /* resubmit the URB */ 175 /* resubmit the URB */
176 urb->status = 0;
177 st = usb_submit_urb(urb, GFP_ATOMIC); 176 st = usb_submit_urb(urb, GFP_ATOMIC);
178 if (st < 0) 177 if (st < 0)
179 PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st); 178 PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
@@ -208,7 +207,13 @@ static void bulk_irq(struct urb *urb
208 PDEBUG(D_PACK, "bulk irq"); 207 PDEBUG(D_PACK, "bulk irq");
209 if (!gspca_dev->streaming) 208 if (!gspca_dev->streaming)
210 return; 209 return;
211 if (urb->status != 0 && urb->status != -ECONNRESET) { 210 switch (urb->status) {
211 case 0:
212 break;
213 case -ECONNRESET:
214 urb->status = 0;
215 break;
216 default:
212#ifdef CONFIG_PM 217#ifdef CONFIG_PM
213 if (!gspca_dev->frozen) 218 if (!gspca_dev->frozen)
214#endif 219#endif