aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/mos7720.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-16 10:16:59 +0300
committerBen Hutchings <ben@decadent.org.uk>2013-10-26 21:05:59 +0100
commit3807f1de20f7e7178a5854bb2066eac56790fe8f (patch)
tree3ce9c82fbf4cc28f5895b5c6dbc6d6a8b1ead9b0 /drivers/usb/serial/mos7720.c
parentbc69de30e8b7933db4f0bbbb7340d13dcec53238 (diff)
downloadkernel_samsung_smdk4412-3807f1de20f7e7178a5854bb2066eac56790fe8f.zip
kernel_samsung_smdk4412-3807f1de20f7e7178a5854bb2066eac56790fe8f.tar.gz
kernel_samsung_smdk4412-3807f1de20f7e7178a5854bb2066eac56790fe8f.tar.bz2
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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/serial/mos7720.c')
-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 9270d5c..71fbe8a 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);