Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b93ec77 authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds
Browse files

[PATCH] drivers/media: fix-up schedule_timeout() usage 



Use schedule_timeout_interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 66c006a5

drivers/media/video/msp3400.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

		}

	}

drivers/media/video/saa7134/saa7134-tvaudio.c

+2 −2
Original line number Diff line number Diff line
@@ -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);