---

yaml --- r: 173979 b: refs/heads/master c: 6a540bd h: refs/heads/master i: 173977: e9672ab 173975: b0f6a9e v: v3
git-mirror · Dec 5, 2009 · 9b4be23 · 9b4be23
1 parent 2c071bc
commit 9b4be23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf926adfbbb36876396511f1bdc78f73dc596e21
+refs/heads/master: 6a540bdf0134fc7198dd053a352b4c414a5e7e19
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
@@ -135,9 +135,10 @@ static void fill_frame(struct gspca_dev *gspca_dev,
 		if (urb->status == -ESHUTDOWN)
 			return;		/* disconnection */
 #ifdef CONFIG_PM
-		if (!gspca_dev->frozen)
+		if (gspca_dev->frozen)
+			return;
 #endif
-			PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
+		PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
 		goto resubmit;
 	}
 	pkt_scan = gspca_dev->sd_desc->pkt_scan;
@@ -218,9 +219,10 @@ static void bulk_irq(struct urb *urb)
 		break;
 	default:
 #ifdef CONFIG_PM
-		if (!gspca_dev->frozen)
+		if (gspca_dev->frozen)
+			return;
 #endif
-			PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
+		PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
 		goto resubmit;
 	}