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

Commit 043e3f83 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: serial: fix write memory-allocation flag 



Fix regression introduced by commit 818f6036 ("USB: serial: add
memory flags to usb_serial_generic_write_start"), which incorrectly used
GFP_KERNEL in write(), which must not not sleep.

Reported-by: default avatarDave Jones <davej@fedoraproject.org>
Tested-by: default avatarDave Jones <davej@fedoraproject.org>
Cc: Dave Jones <davej@fedoraproject.org>
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f648546

drivers/usb/serial/generic.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ int usb_serial_generic_write(struct tty_struct *tty, 
		return 0;



	count = kfifo_in_locked(&port->write_fifo, buf, count, &port->lock);

	result = usb_serial_generic_write_start(port, GFP_KERNEL);

	result = usb_serial_generic_write_start(port, GFP_ATOMIC);

	if (result)

		return result;