aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/gspca.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/gspca.c')
-rw-r--r--drivers/media/video/gspca/gspca.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 3298e33c7822..eb166048540d 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -135,9 +135,10 @@ static void fill_frame(struct gspca_dev *gspca_dev,
135 if (urb->status == -ESHUTDOWN) 135 if (urb->status == -ESHUTDOWN)
136 return; /* disconnection */ 136 return; /* disconnection */
137#ifdef CONFIG_PM 137#ifdef CONFIG_PM
138 if (!gspca_dev->frozen) 138 if (gspca_dev->frozen)
139 return;
139#endif 140#endif
140 PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status); 141 PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
141 goto resubmit; 142 goto resubmit;
142 } 143 }
143 pkt_scan = gspca_dev->sd_desc->pkt_scan; 144 pkt_scan = gspca_dev->sd_desc->pkt_scan;
@@ -218,9 +219,10 @@ static void bulk_irq(struct urb *urb)
218 break; 219 break;
219 default: 220 default:
220#ifdef CONFIG_PM 221#ifdef CONFIG_PM
221 if (!gspca_dev->frozen) 222 if (gspca_dev->frozen)
223 return;
222#endif 224#endif
223 PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status); 225 PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
224 goto resubmit; 226 goto resubmit;
225 } 227 }
226 228