diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-06 23:22:36 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-06 23:22:36 +0300 |
| commit | 5002921407ca0ae03d8066fa5b64b4dab868a361 (patch) | |
| tree | 1babc3bf28beaa503dd4af7bded576fb1e258558 /drivers/usb/serial/opticon.c | |
| parent | f20531a9aae0c7378d9fa75b4b5d99b7eecab066 (diff) | |
| parent | e681286de221af78fc85db9222b6a203148c005a (diff) | |
| download | linux-5002921407ca0ae03d8066fa5b64b4dab868a361.tar.xz | |
Merge tag 'usb-serial-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v3.18-rc4
Two fixes of non-atomic allocations in write paths.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/opticon.c')
| -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 4856fb7e637e..4b7bfb394a32 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c @@ -215,7 +215,7 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port, /* The connected 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) { count = -ENOMEM; goto error_no_dr; |