diff options
| author | Johan Hovold <johan@kernel.org> | 2014-10-29 09:07:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:47:59 -0800 |
| commit | 547d682d568271cf537af2850a066a287a51b62b (patch) | |
| tree | 82dc01ee43222989987c973081d2bdf89a9d2cc3 | |
| parent | b0476c87764ac62d79390678cefb3821308a5d08 (diff) | |
| download | linux-3.10-547d682d568271cf537af2850a066a287a51b62b.tar.gz linux-3.10-547d682d568271cf537af2850a066a287a51b62b.tar.bz2 linux-3.10-547d682d568271cf537af2850a066a287a51b62b.zip | |
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 <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/serial/opticon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index 5f4b0cd0f6e..b0eb1dfc601 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c @@ -219,7 +219,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; |