diff --git a/[refs] b/[refs]
index f72dc60ecf99..223ab6cbc0ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d19a2c1186d86e38b51ef59e4b9678f8ad7acf4
+refs/heads/master: 8157852f73f961b28d495bfa8374263d293b106d
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
index 369eddd352c3..08433f77245a 100644
--- a/trunk/drivers/media/video/gspca/gspca.c
+++ b/trunk/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;
 	}