浏览代码

V4L/DVB (13185): gspca: Don't resubmit error status URB's when suspending

gspca: Don't resubmit error status URB's when suspending

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Hans de Goede 16 年之前
父节点
当前提交
6a540bdf01
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      drivers/media/video/gspca/gspca.c

+ 6 - 4
drivers/media/video/gspca/gspca.c

@@ -135,9 +135,10 @@ static void fill_frame(struct gspca_dev *gspca_dev,
 		if (urb->status == -ESHUTDOWN)
 		if (urb->status == -ESHUTDOWN)
 			return;		/* disconnection */
 			return;		/* disconnection */
 #ifdef CONFIG_PM
 #ifdef CONFIG_PM
-		if (!gspca_dev->frozen)
+		if (gspca_dev->frozen)
+			return;
 #endif
 #endif
-			PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
+		PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
 		goto resubmit;
 		goto resubmit;
 	}
 	}
 	pkt_scan = gspca_dev->sd_desc->pkt_scan;
 	pkt_scan = gspca_dev->sd_desc->pkt_scan;
@@ -218,9 +219,10 @@ static void bulk_irq(struct urb *urb)
 		break;
 		break;
 	default:
 	default:
 #ifdef CONFIG_PM
 #ifdef CONFIG_PM
-		if (!gspca_dev->frozen)
+		if (gspca_dev->frozen)
+			return;
 #endif
 #endif
-			PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
+		PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
 		goto resubmit;
 		goto resubmit;
 	}
 	}