summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-16 10:16:59 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 16:52:46 -0700
commitd723c89020d4f5f54b42997ae5e90f13bc620d8b (patch)
tree160196465ea5dce6ea4d7bde9fa16ada5b7f75f6
parent71d5f63763f01e5577c465d6752b7060ba105fa6 (diff)
downloadkernel-common-d723c89020d4f5f54b42997ae5e90f13bc620d8b.tar.gz
kernel-common-d723c89020d4f5f54b42997ae5e90f13bc620d8b.tar.bz2
kernel-common-d723c89020d4f5f54b42997ae5e90f13bc620d8b.zip
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>
-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 267dff941d63..90f7ad57ebc3 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);