diff options
Diffstat (limited to 'drivers/media/dvb/cinergyT2/cinergyT2.c')
-rw-r--r-- | drivers/media/dvb/cinergyT2/cinergyT2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c index 28929b618e20..5a12b5679556 100644 --- a/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/drivers/media/dvb/cinergyT2/cinergyT2.c | |||
@@ -548,19 +548,19 @@ static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct | |||
548 | { | 548 | { |
549 | struct dvb_device *dvbdev = file->private_data; | 549 | struct dvb_device *dvbdev = file->private_data; |
550 | struct cinergyt2 *cinergyt2 = dvbdev->priv; | 550 | struct cinergyt2 *cinergyt2 = dvbdev->priv; |
551 | unsigned int mask = 0; | 551 | unsigned int mask = 0; |
552 | 552 | ||
553 | if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem)) | 553 | if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem)) |
554 | return -ERESTARTSYS; | 554 | return -ERESTARTSYS; |
555 | 555 | ||
556 | poll_wait(file, &cinergyt2->poll_wq, wait); | 556 | poll_wait(file, &cinergyt2->poll_wq, wait); |
557 | 557 | ||
558 | if (cinergyt2->pending_fe_events != 0) | 558 | if (cinergyt2->pending_fe_events != 0) |
559 | mask |= (POLLIN | POLLRDNORM | POLLPRI); | 559 | mask |= (POLLIN | POLLRDNORM | POLLPRI); |
560 | 560 | ||
561 | mutex_unlock(&cinergyt2->sem); | 561 | mutex_unlock(&cinergyt2->sem); |
562 | 562 | ||
563 | return mask; | 563 | return mask; |
564 | } | 564 | } |
565 | 565 | ||
566 | 566 | ||
@@ -1008,6 +1008,8 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state) | |||
1008 | cinergyt2_sleep(cinergyt2, 1); | 1008 | cinergyt2_sleep(cinergyt2, 1); |
1009 | mutex_unlock(&cinergyt2->sem); | 1009 | mutex_unlock(&cinergyt2->sem); |
1010 | 1010 | ||
1011 | mutex_unlock(&cinergyt2->wq_sem); | ||
1012 | |||
1011 | return 0; | 1013 | return 0; |
1012 | } | 1014 | } |
1013 | 1015 | ||