diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 14:48:40 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:24:35 -0400 |
commit | 9b7cc42917ed07ab75269d35cd7709a5fd6336e0 (patch) | |
tree | 895a8cb1720bfc0f4b86f0381535729dcb35dbbe /drivers/media/dvb | |
parent | 18f3fa1e2eab297a2f7ec704385fa0ecfda0de55 (diff) |
V4L/DVB (5820): Cleanup on cinergyT2: Remove unneeded if(1)
Before kernel 2.6.14, the driver checked for status before stopping the
thread. So, a compatibility test did exist. After 2.6.14, the
if (state)
were replaced by:
if (1)
However, it makes no sense to keep the if(1).
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/cinergyT2/cinergyT2.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c index bc22064b50ef..5a1449f485cf 100644 --- a/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/drivers/media/dvb/cinergyT2/cinergyT2.c | |||
@@ -1000,18 +1000,15 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state) | |||
1000 | if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem)) | 1000 | if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem)) |
1001 | return -ERESTARTSYS; | 1001 | return -ERESTARTSYS; |
1002 | 1002 | ||
1003 | if (1) { | 1003 | cinergyt2_suspend_rc(cinergyt2); |
1004 | cinergyt2_suspend_rc(cinergyt2); | 1004 | cancel_rearming_delayed_work(&cinergyt2->query_work); |
1005 | cancel_rearming_delayed_work(&cinergyt2->query_work); | ||
1006 | 1005 | ||
1007 | mutex_lock(&cinergyt2->sem); | 1006 | mutex_lock(&cinergyt2->sem); |
1008 | if (cinergyt2->streaming) | 1007 | if (cinergyt2->streaming) |
1009 | cinergyt2_stop_stream_xfer(cinergyt2); | 1008 | cinergyt2_stop_stream_xfer(cinergyt2); |
1010 | cinergyt2_sleep(cinergyt2, 1); | 1009 | cinergyt2_sleep(cinergyt2, 1); |
1011 | mutex_unlock(&cinergyt2->sem); | 1010 | mutex_unlock(&cinergyt2->sem); |
1012 | } | ||
1013 | 1011 | ||
1014 | mutex_unlock(&cinergyt2->wq_sem); | ||
1015 | return 0; | 1012 | return 0; |
1016 | } | 1013 | } |
1017 | 1014 | ||