From: Johan Hovold Date: Wed, 29 Oct 2014 08:07:31 +0000 (+0100) Subject: USB: opticon: fix non-atomic allocation in write path X-Git-Tag: v3.4.106~56 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18e9928652ab76bc3044ab872199ced278e0be75;p=platform%2Fkernel%2Flinux-stable.git USB: opticon: fix non-atomic allocation in write path commit e681286de221af78fc85db9222b6a203148c005a upstream. Write may be called from interrupt context so make sure to use GFP_ATOMIC for all allocations in write. Fixes: 0d930e51cfe6 ("USB: opticon: Add Opticon OPN2001 write support") Signed-off-by: Johan Hovold Signed-off-by: Zefan Li --- diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index 1f850065d159..58b7cecd682f 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c @@ -293,7 +293,7 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port, /* The conncected devices do not have a bulk write endpoint, * to transmit data to de barcode device the control endpoint is used */ - dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_NOIO); + dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC); if (!dr) { dev_err(&port->dev, "out of memory\n"); count = -ENOMEM;