diff options
author | Jens Axboe <axboe@fb.com> | 2016-09-15 08:38:34 -0600 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2016-09-15 08:38:34 -0600 |
commit | 474b313de79e034e269955de23231da769a521b7 (patch) | |
tree | 877e3c883aff3edfe4f378c69f7ba738b0d8ef94 /drivers/usb/serial/mos7720.c | |
parent | 2849450ad39d2e699fda2d5c6f41e05d87fd7004 (diff) | |
parent | ee8d41e53efe14bfc5ea5866e1178b06d78a7c95 (diff) | |
download | linux-474b313de79e034e269955de23231da769a521b7.tar.gz |
Merge branch 'irq/for-block' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-4.9/msi-irq
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 5608af4a369d..de9992b492b0 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c @@ -1252,7 +1252,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; } |