diff options
author | Takashi Iwai | 2008-12-01 18:02:17 +0100 |
---|---|---|
committer | Takashi Iwai | 2008-12-01 18:02:17 +0100 |
commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
tree | 214348d40ed547a72f9612a7e5c94a01afded812 /drivers/net/wireless/libertas_tf/if_usb.c | |
parent | ALSA: soc - Remove obsoleted sound/driver.h inclusion (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
download | kernel-qcow2-linux-3af4182cc5be7d5505f9801ee3297373f1872446.tar.gz kernel-qcow2-linux-3af4182cc5be7d5505f9801ee3297373f1872446.tar.xz kernel-qcow2-linux-3af4182cc5be7d5505f9801ee3297373f1872446.zip |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'drivers/net/wireless/libertas_tf/if_usb.c')
-rw-r--r-- | drivers/net/wireless/libertas_tf/if_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c index 1cc03a8dd67a..59634c33b1f9 100644 --- a/drivers/net/wireless/libertas_tf/if_usb.c +++ b/drivers/net/wireless/libertas_tf/if_usb.c @@ -331,7 +331,7 @@ static int __if_usb_submit_rx_urb(struct if_usb_card *cardp, /* Fill the receive configuration URB and initialise the Rx call back */ usb_fill_bulk_urb(cardp->rx_urb, cardp->udev, usb_rcvbulkpipe(cardp->udev, cardp->ep_in), - (void *) (skb->tail), + skb_tail_pointer(skb), MRVDRV_ETH_RX_PACKET_BUFFER_SIZE, callbackfn, cardp); cardp->rx_urb->transfer_flags |= URB_ZERO_PACKET; |