[PATCH] drivers/media: fix-up schedule_timeout() usage
authorNishanth Aravamudan <nacc@us.ibm.com>
Mon, 7 Nov 2005 09:01:18 +0000 (01:01 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 15:53:57 +0000 (07:53 -0800)
Use schedule_timeout_interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/media/video/msp3400.c
drivers/media/video/saa7134/saa7134-tvaudio.c

index 262890cb20a7daf55de5d25d6840db40a6eb9dc3..e75e7948fd9d84b32ea51642beadf9c676f6b113 100644 (file)
@@ -741,8 +741,8 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
                        set_current_state(TASK_INTERRUPTIBLE);
                        schedule();
                } else {
-                       set_current_state(TASK_INTERRUPTIBLE);
-                       schedule_timeout(msecs_to_jiffies(timeout));
+                       schedule_timeout_interruptible
+                                               (msecs_to_jiffies(timeout));
                }
        }
 
index badf2f9e3072bf8befeaba2278551ee463903e60..61a2d6b50eef29ad67948a5a04a324fcde367554 100644 (file)
@@ -342,8 +342,8 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout)
                        set_current_state(TASK_INTERRUPTIBLE);
                        schedule();
                } else {
-                       set_current_state(TASK_INTERRUPTIBLE);
-                       schedule_timeout(msecs_to_jiffies(timeout));
+                       schedule_timeout_interruptible
+                                               (msecs_to_jiffies(timeout));
                }
        }
        remove_wait_queue(&dev->thread.wq, &wait);