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

Commit 329fddd7 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jesper Nilsson
Browse files

cris: sync_serial: remove interruptible_sleep_on 



sleep_on and its variants are racy and going away. This replaces
the two uses in the cris sync_serial drivers with the equivalent
but race-free wait_event_interruptible.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Mikael Starvik <starvik@axis.com>
Cc: linux-cris-kernel@axis.com
Signed-off-by: default avatarJesper Nilsson <jespern@axis.com>
parent 64d8ad93

arch/cris/arch-v10/drivers/sync_serial.c

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/init.h>

#include <linux/mutex.h>

#include <linux/timer.h>

#include <linux/wait.h>

#include <asm/irq.h>

#include <asm/dma.h>

#include <asm/io.h>
@@ -1136,7 +1137,8 @@ static ssize_t sync_serial_read(struct file *file, char *buf, 
		if (file->f_flags & O_NONBLOCK)

			return -EAGAIN;



		interruptible_sleep_on(&port->in_wait_q);

		wait_event_interruptible(port->in_wait_q,

					 !(start == end && !port->full));

		if (signal_pending(current))

			return -EINTR;

arch/cris/arch-v32/drivers/sync_serial.c

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/init.h>

#include <linux/timer.h>

#include <linux/spinlock.h>

#include <linux/wait.h>



#include <asm/io.h>

#include <dma.h>
@@ -1144,7 +1145,8 @@ static ssize_t sync_serial_read(struct file * file, char * buf, 
		if (file->f_flags & O_NONBLOCK)

			return -EAGAIN;



		interruptible_sleep_on(&port->in_wait_q);

		wait_event_interruptible(port->in_wait_q,

					 !(start == end && !port->full));

		if (signal_pending(current))

			return -EINTR;