diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-05-02 12:56:46 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-09 23:52:36 +0200 |
| commit | 34a7864db1bc6d9ceb466251957fccf90c7106f8 (patch) | |
| tree | 3d5a7b5f97965b044f84e7fc14ca297191d93795 /drivers/media/video | |
| parent | V4L/DVB (11664): cx23885: Frontend wasn't locking on HVR-1500 (diff) | |
| download | linux-34a7864db1bc6d9ceb466251957fccf90c7106f8.tar.xz linux-34a7864db1bc6d9ceb466251957fccf90c7106f8.zip | |
V4L/DVB (11668): ivtv: fix compiler warning.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index b0195e8ee4d1..db2ac9a99acd 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c @@ -305,14 +305,17 @@ int ivtv_waitq(wait_queue_head_t *waitq) /* Generic utility functions */ int ivtv_msleep_timeout(unsigned int msecs, int intr) { - int ret; int timeout = msecs_to_jiffies(msecs); do { set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); timeout = schedule_timeout(timeout); - if (intr && (ret = signal_pending(current))) - return ret; + if (intr) { + int ret = signal_pending(current); + + if (ret) + return ret; + } } while (timeout); return 0; } |