diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-16 03:16:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-19 20:02:11 -0400 |
commit | d0bd9a41186e076ea543c397ad8a67a6cf604b55 (patch) | |
tree | b2f2ebe3b6e172325eb19b09a82ec7be1b3da2df /drivers/usb/serial | |
parent | 9c1d6962517e4a441dcfca480a4f3e1e73c84591 (diff) |
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/serial')
-rw-r--r-- | drivers/usb/serial/mos7720.c | 2 |
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, | |||
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); |