diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-02 12:56:46 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-02 12:56:46 +0200 |
| commit | ce05681eb1dbee65c3110182492f84519f264326 (patch) | |
| tree | 2285bed49498618b2ede498373e9e1beb13d4725 /linux/drivers/media/video/ivtv/ivtv-driver.c | |
| parent | 8e486437eb10877f68559d80ba3782057ef7b2a1 (diff) | |
| download | mediapointer-dvb-s2-ce05681eb1dbee65c3110182492f84519f264326.tar.gz mediapointer-dvb-s2-ce05681eb1dbee65c3110182492f84519f264326.tar.bz2 | |
ivtv: fix compiler warning.
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: high
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c index 4ddeb165d..d5bdcd372 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.c +++ b/linux/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; } |