From 9b4be235243395af14c378d6d68178023ab638e9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 24 Oct 2009 15:02:14 -0300 Subject: [PATCH] --- yaml --- r: 173979 b: refs/heads/master c: 6a540bdf0134fc7198dd053a352b4c414a5e7e19 h: refs/heads/master i: 173977: e9672ab2aa565b8498b137d5f4077de326441273 173975: b0f6a9e0eb9b446509a3e60a1cb0ea750f3c63a2 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/gspca.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index af9763688838..bf044559012e 100644 --- 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 index 3298e33c7822..eb166048540d 100644 --- 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; }