diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/atm/usbatm.c | 2 | ||||
-rw-r--r-- | drivers/usb/net/catc.c | 2 | ||||
-rw-r--r-- | drivers/usb/net/pegasus.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index a076f735a7bc..d287c5755229 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c | |||
@@ -484,7 +484,7 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance, | |||
484 | ptr[4] = 0xec; | 484 | ptr[4] = 0xec; |
485 | ptr += ATM_CELL_HEADER; | 485 | ptr += ATM_CELL_HEADER; |
486 | 486 | ||
487 | memcpy(ptr, skb->data, data_len); | 487 | skb_copy_from_linear_data(skb, ptr, data_len); |
488 | ptr += data_len; | 488 | ptr += data_len; |
489 | __skb_pull(skb, data_len); | 489 | __skb_pull(skb, data_len); |
490 | 490 | ||
diff --git a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c index d82022dd7f2e..ffec2e01b896 100644 --- a/drivers/usb/net/catc.c +++ b/drivers/usb/net/catc.c | |||
@@ -418,7 +418,7 @@ static int catc_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
418 | catc->tx_ptr = (((catc->tx_ptr - 1) >> 6) + 1) << 6; | 418 | catc->tx_ptr = (((catc->tx_ptr - 1) >> 6) + 1) << 6; |
419 | tx_buf = catc->tx_buf[catc->tx_idx] + catc->tx_ptr; | 419 | tx_buf = catc->tx_buf[catc->tx_idx] + catc->tx_ptr; |
420 | *((u16*)tx_buf) = (catc->is_f5u011) ? cpu_to_be16((u16)skb->len) : cpu_to_le16((u16)skb->len); | 420 | *((u16*)tx_buf) = (catc->is_f5u011) ? cpu_to_be16((u16)skb->len) : cpu_to_le16((u16)skb->len); |
421 | memcpy(tx_buf + 2, skb->data, skb->len); | 421 | skb_copy_from_linear_data(skb, tx_buf + 2, skb->len); |
422 | catc->tx_ptr += skb->len + 2; | 422 | catc->tx_ptr += skb->len + 2; |
423 | 423 | ||
424 | if (!test_and_set_bit(TX_RUNNING, &catc->flags)) | 424 | if (!test_and_set_bit(TX_RUNNING, &catc->flags)) |
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c index 13f70e09ea40..1ad4ee54b186 100644 --- a/drivers/usb/net/pegasus.c +++ b/drivers/usb/net/pegasus.c | |||
@@ -889,7 +889,7 @@ static int pegasus_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
889 | netif_stop_queue(net); | 889 | netif_stop_queue(net); |
890 | 890 | ||
891 | ((__le16 *) pegasus->tx_buff)[0] = cpu_to_le16(l16); | 891 | ((__le16 *) pegasus->tx_buff)[0] = cpu_to_le16(l16); |
892 | memcpy(pegasus->tx_buff + 2, skb->data, skb->len); | 892 | skb_copy_from_linear_data(skb, pegasus->tx_buff + 2, skb->len); |
893 | usb_fill_bulk_urb(pegasus->tx_urb, pegasus->usb, | 893 | usb_fill_bulk_urb(pegasus->tx_urb, pegasus->usb, |
894 | usb_sndbulkpipe(pegasus->usb, 2), | 894 | usb_sndbulkpipe(pegasus->usb, 2), |
895 | pegasus->tx_buff, count, | 895 | pegasus->tx_buff, count, |