]> git.ipfire.org Git - people/ms/linux.git/commitdiff
USB: mos7720: use GFP_ATOMIC under spinlock
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 16 Aug 2013 07:16:59 +0000 (10:16 +0300)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 26 Oct 2013 20:05:59 +0000 (21:05 +0100)
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>
drivers/usb/serial/mos7720.c

index 9270d5c919cf77f203bf919aefb9fc921f61fa82..71fbe8a54537b7876997d7b2956fba4891cb6302 100644 (file)
@@ -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);