summaryrefslogtreecommitdiffstats
path: root/drivers/usb
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-08-19 17:02:11 -0700
commitd0bd9a41186e076ea543c397ad8a67a6cf604b55 (patch)
treeb2f2ebe3b6e172325eb19b09a82ec7be1b3da2df /drivers/usb
parent9c1d6962517e4a441dcfca480a4f3e1e73c84591 (diff)
downloadblackbird-op-linux-d0bd9a41186e076ea543c397ad8a67a6cf604b55.tar.gz
blackbird-op-linux-d0bd9a41186e076ea543c397ad8a67a6cf604b55.zip
USB: mos7720: use GFP_ATOMIC under spinlock
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> Cc: stable@vger.kernel.org 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 b01300164fc0..248fda6d06f8 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -374,7 +374,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);
OpenPOWER on IntegriCloud