]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: vt6656: replace GFP_ATOMIC with GFP_KERNEL for urb allocation
authorAlison Schofield <amsfield22@gmail.com>
Fri, 12 Feb 2016 18:05:01 +0000 (10:05 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Feb 2016 00:25:38 +0000 (16:25 -0800)
Replace GFP_ATOMIC with GFP_KERNEL during urb buffer allocation.
This makes vnt_alloc_bufs() consistent in setting GFP_KERNEL during
kmalloc() and usb_alloc_urb(). GFP_KERNEL is safe because we are in
process context, not in an interrupt handler, nor holding any spinlock.

Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/main_usb.c

index 05f86ff8875c9b2f67fe465e4c8715ab7b2c6f85..f9afab77b79fb5e5718d1b19a2df5e7cb1cd35fa 100644 (file)
@@ -439,7 +439,7 @@ static bool vnt_alloc_bufs(struct vnt_private *priv)
                tx_context->pkt_no = ii;
 
                /* allocate URBs */
-               tx_context->urb = usb_alloc_urb(0, GFP_ATOMIC);
+               tx_context->urb = usb_alloc_urb(0, GFP_KERNEL);
                if (!tx_context->urb) {
                        dev_err(&priv->usb->dev, "alloc tx urb failed\n");
                        goto free_tx;
@@ -461,7 +461,7 @@ static bool vnt_alloc_bufs(struct vnt_private *priv)
                rcb->priv = priv;
 
                /* allocate URBs */
-               rcb->urb = usb_alloc_urb(0, GFP_ATOMIC);
+               rcb->urb = usb_alloc_urb(0, GFP_KERNEL);
                if (!rcb->urb) {
                        dev_err(&priv->usb->dev, "Failed to alloc rx urb\n");
                        goto free_rx_tx;
@@ -478,7 +478,7 @@ static bool vnt_alloc_bufs(struct vnt_private *priv)
                        goto free_rx_tx;
        }
 
-       priv->interrupt_urb = usb_alloc_urb(0, GFP_ATOMIC);
+       priv->interrupt_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!priv->interrupt_urb) {
                dev_err(&priv->usb->dev, "Failed to alloc int urb\n");
                goto free_rx_tx;