diff options
| author | Alison Schofield <amsfield22@gmail.com> | 2016-02-12 10:05:01 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 16:25:38 -0800 |
| commit | 3e0f86b337090ec9040b68e398a85be00ddee4bc (patch) | |
| tree | b0d5e3616a42499c51075d6ad225a791e57db57b | |
| parent | 61abd03a3dba2f6a73c06930075935683b474fa8 (diff) | |
| download | linux-3e0f86b337090ec9040b68e398a85be00ddee4bc.tar.bz2 | |
staging: vt6656: replace GFP_ATOMIC with GFP_KERNEL for urb allocation
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>
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 05f86ff8875c..f9afab77b79f 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -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; |