lircs
diff --git a/‎drivers/char/nwbutton.c‎
Lines changed: 4 additions & 1 deletion b/‎drivers/char/nwbutton.c‎
Lines changed: 4 additions & 1 deletion
@@ -168,7 +168,10 @@ static irqreturn_t button_handler (int irq, void *dev_id)
 static int button_read (struct file *filp, char __user *buffer,
 			size_t count, loff_t *ppos)
 {
-	interruptible_sleep_on (&button_wait_queue);
+	DEFINE_WAIT(wait);
+	prepare_to_wait(&button_wait_queue, &wait, TASK_INTERRUPTIBLE);
+	schedule();
+	finish_wait(&button_wait_queue, &wait);
 	return (copy_to_user (buffer, &button_output_buffer, bcount))
 		 ? -EFAULT : bcount;
 }
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,10 @@ static irqreturn_t button_handler (int irq, void *dev_id)`
`168`	`168`	`static int button_read (struct file filp, char __user buffer,`
`169`	`169`	`size_t count, loff_t *ppos)`
`170`	`170`	`{`
`171`		`- interruptible_sleep_on (&button_wait_queue);`
	`171`	`+ DEFINE_WAIT(wait);`
	`172`	`+ prepare_to_wait(&button_wait_queue, &wait, TASK_INTERRUPTIBLE);`
	`173`	`+ schedule();`
	`174`	`+ finish_wait(&button_wait_queue, &wait);`
`172`	`175`	`return (copy_to_user (buffer, &button_output_buffer, bcount))`
`173`	`176`	`? -EFAULT : bcount;`
`174`	`177`	`}`