diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-16 10:46:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-16 10:46:42 -0300 |
| commit | 232fd0b3fa9770197cfeb0a7dd40ac52729104f2 (patch) | |
| tree | b32cc58b284d4007f979c6286eefce6dfbfd27a3 | |
| parent | bcb7869683912e8dca99bace426b7e080851354c (diff) | |
| download | mediapointer-dvb-s2-232fd0b3fa9770197cfeb0a7dd40ac52729104f2.tar.gz mediapointer-dvb-s2-232fd0b3fa9770197cfeb0a7dd40ac52729104f2.tar.bz2 | |
Clean up setting state and scheduling timeouts
From: Robert P. J. Day <rpjday@mindspring.com>
Replace assignments to "current->state" with the preferred calls to
schedule_timeout_interruptible().
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/vino.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index d6364b01f..f8c594a09 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -180,8 +180,7 @@ static int msp_read(struct i2c_client *client, int dev, int addr) break; v4l_warn(client, "I/O error #%d (read 0x%02x/0x%02x)\n", err, dev, addr); - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(msecs_to_jiffies(10)); + schedule_timeout_interruptible(msecs_to_jiffies(10)); } if (err == 3) { v4l_warn(client, "giving up, resetting chip. Sound will go off, sorry folks :-|\n"); @@ -220,8 +219,7 @@ static int msp_write(struct i2c_client *client, int dev, int addr, int val) break; v4l_warn(client, "I/O error #%d (write 0x%02x/0x%02x)\n", err, dev, addr); - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(msecs_to_jiffies(10)); + schedule_timeout_interruptible(msecs_to_jiffies(10)); } if (err == 3) { v4l_warn(client, "giving up, resetting chip. Sound will go off, sorry folks :-|\n"); diff --git a/linux/drivers/media/video/vino.c b/linux/drivers/media/video/vino.c index 26f99cf1d..c4893e9e3 100644 --- a/linux/drivers/media/video/vino.c +++ b/linux/drivers/media/video/vino.c @@ -2077,12 +2077,10 @@ static int vino_wait_for_frame(struct vino_channel_settings *vcs) init_waitqueue_entry(&wait, current); /* add ourselves into wait queue */ add_wait_queue(&vcs->fb_queue.frame_wait_queue, &wait); - /* and set current state */ - set_current_state(TASK_INTERRUPTIBLE); /* to ensure that schedule_timeout will return immediately - * if VINO interrupt was triggred meanwhile */ - schedule_timeout(HZ / 10); + * if VINO interrupt was triggered meanwhile */ + schedule_timeout_interruptible(HZ / 10); if (signal_pending(current)) err = -EINTR; |