summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-16 11:16:59 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-27 04:15:31 +0400
commit659158c56cdc169455bfc43d795a488fb703b747 (patch)
tree54bf89f1bdef74081f3755c48a81dbe0064f9f8a /drivers/usb
parentb9ba2a57551649a3386acf0fb54255e5b042bd43 (diff)
downloadlinux-659158c56cdc169455bfc43d795a488fb703b747.tar.xz
USB: mos7720: use GFP_ATOMIC under spinlock
commit d0bd9a41186e076ea543c397ad8a67a6cf604b55 upstream. The write_parport_reg_nonblock() function shouldn't sleep because it's called with spinlocks held. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/mos7720.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index cdde45dee67d..2238eb1ee1e8 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -383,7 +383,7 @@ static int write_parport_reg_nonblock(struct mos7715_parport *mos_parport,
kfree(urbtrack);
return -ENOMEM;
}
- urbtrack->setup = kmalloc(sizeof(*urbtrack->setup), GFP_KERNEL);
+ urbtrack->setup = kmalloc(sizeof(*urbtrack->setup), GFP_ATOMIC);
if (!urbtrack->setup) {
usb_free_urb(urbtrack->urb);
kfree(urbtrack);