aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-16 03:16:59 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 20:18:06 -0400
commit3765762187edd49446c94884aa88c952cec41116 (patch)
treed98a9b84c2bb8593dfad07638fb53affc95b35a7 /drivers/usb/serial
parent3fa0d2f124263d0080f266c4c7bfc60153f29b91 (diff)
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/serial')
-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 5050cc8584ba..6577b7d1d2b8 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,
374 kfree(urbtrack); 374 kfree(urbtrack);
375 return -ENOMEM; 375 return -ENOMEM;
376 } 376 }
377 urbtrack->setup = kmalloc(sizeof(*urbtrack->setup), GFP_KERNEL); 377 urbtrack->setup = kmalloc(sizeof(*urbtrack->setup), GFP_ATOMIC);
378 if (!urbtrack->setup) { 378 if (!urbtrack->setup) {
379 usb_free_urb(urbtrack->urb); 379 usb_free_urb(urbtrack->urb);
380 kfree(urbtrack); 380 kfree(urbtrack);