Commit 3e0f86b3 authored by Alison Schofield's avatar Alison Schofield Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlison Schofield <amsfield22@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61abd03a

drivers/staging/vt6656/main_usb.c

+3 −3
Original line number Diff line number Diff line
@@ -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;