aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/gspca.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-11-13 05:15:08 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:41:58 -0500
commit8157852f73f961b28d495bfa8374263d293b106d (patch)
treef232c227fbb0938ecd12eb94c6cf7568a5d6292d /drivers/media/video/gspca/gspca.c
parent2d19a2c1186d86e38b51ef59e4b9678f8ad7acf4 (diff)
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>
Diffstat (limited to 'drivers/media/video/gspca/gspca.c')
-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,
139 return; 139 return;
140#endif 140#endif
141 PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status); 141 PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
142 urb->status = 0;
142 goto resubmit; 143 goto resubmit;
143 } 144 }
144 pkt_scan = gspca_dev->sd_desc->pkt_scan; 145 pkt_scan = gspca_dev->sd_desc->pkt_scan;
@@ -214,15 +215,13 @@ static void bulk_irq(struct urb *urb)
214 break; 215 break;
215 case -ESHUTDOWN: 216 case -ESHUTDOWN:
216 return; /* disconnection */ 217 return; /* disconnection */
217 case -ECONNRESET:
218 urb->status = 0;
219 break;
220 default: 218 default:
221#ifdef CONFIG_PM 219#ifdef CONFIG_PM
222 if (gspca_dev->frozen) 220 if (gspca_dev->frozen)
223 return; 221 return;
224#endif 222#endif
225 PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status); 223 PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
224 urb->status = 0;
226 goto resubmit; 225 goto resubmit;
227 } 226 }
228 227