Commit 3fef15f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'auxdisplay-for-linus-v5.12-rc6' of git://github.com/ojeda/linux 

Pull auxdisplay fix from Miguel Ojeda:
 "Remove in_interrupt() usage (Sebastian Andrzej Siewior)"

* tag 'auxdisplay-for-linus-v5.12-rc6' of git://github.com/ojeda/linux:
  auxdisplay: Remove in_interrupt() usage.
parents 36a14638 701454bc

drivers/auxdisplay/charlcd.c

+8 −10
Original line number Diff line number Diff line
@@ -470,12 +470,14 @@ static ssize_t charlcd_write(struct file *file, const char __user *buf, 
	char c;



	for (; count-- > 0; (*ppos)++, tmp++) {

		if (!in_interrupt() && (((count + 1) & 0x1f) == 0))

		if (((count + 1) & 0x1f) == 0) {

			/*

			 * let's be a little nice with other processes

			 * that need some CPU

			 * charlcd_write() is invoked as a VFS->write() callback

			 * and as such it is always invoked from preemptible

			 * context and may sleep.

			 */

			schedule();

			cond_resched();

		}



		if (get_user(c, tmp))

			return -EFAULT;
@@ -537,12 +539,8 @@ static void charlcd_puts(struct charlcd *lcd, const char *s) 
	int count = strlen(s);



	for (; count-- > 0; tmp++) {

		if (!in_interrupt() && (((count + 1) & 0x1f) == 0))

			/*

			 * let's be a little nice with other processes

			 * that need some CPU

			 */

			schedule();

		if (((count + 1) & 0x1f) == 0)

			cond_resched();



		charlcd_write_char(lcd, *tmp);

	}