lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (5820): Cleanup on cinergyT2: Remove unneeded if(1)

Browse Source 
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>
This commit is contained in:
Mauro Carvalho Chehab
2007-07-02 15:48:40 -03:00
parent 18f3fa1e2e
commit 9b7cc42917
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/dvb/cinergyT2/cinergyT2.c
View File

@@ -1000,18 +1000,15 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)
if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem)) if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem))
return -ERESTARTSYS; return -ERESTARTSYS;
if (1) { cinergyt2_suspend_rc(cinergyt2);
cinergyt2_suspend_rc(cinergyt2); cancel_rearming_delayed_work(&cinergyt2->query_work);
cancel_rearming_delayed_work(&cinergyt2->query_work);
mutex_lock(&cinergyt2->sem); mutex_lock(&cinergyt2->sem);
if (cinergyt2->streaming) if (cinergyt2->streaming)
cinergyt2_stop_stream_xfer(cinergyt2); cinergyt2_stop_stream_xfer(cinergyt2);
cinergyt2_sleep(cinergyt2, 1); cinergyt2_sleep(cinergyt2, 1);
mutex_unlock(&cinergyt2->sem); mutex_unlock(&cinergyt2->sem);
}
mutex_unlock(&cinergyt2->wq_sem);
return 0; return 0;
} }