diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-09-19 12:30:55 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-09-19 12:30:55 +0800 |
| commit | fe522b1745154e8889a04b87e76d53ccece41d4a (patch) | |
| tree | a3936cc8a12b60bcb2f5d7dd73ae48d7dbf55f81 /drivers/usb/serial/mos7720.c | |
| parent | 3b5fdc0c9bc5279975f1c775a2d7dd4ccbf2f40f (diff) | |
| parent | a8e202812b52b88e2a33d52687b3b0260706231a (diff) | |
Merge tag 'v3.18.42' into linux-linaro-lsk-v3.18lsk-v3.18-16.09
This is the 3.18.42 stable release
Diffstat (limited to 'drivers/usb/serial/mos7720.c')
| -rw-r--r-- | drivers/usb/serial/mos7720.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index dfd728a263d2..c3b8ae360424 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c @@ -1239,7 +1239,7 @@ static int mos7720_write(struct tty_struct *tty, struct usb_serial_port *port, if (urb->transfer_buffer == NULL) { urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE, - GFP_KERNEL); + GFP_ATOMIC); if (!urb->transfer_buffer) goto exit; } |