diff options
Diffstat (limited to 'drivers/net/usb/kaweth.c')
-rw-r--r-- | drivers/net/usb/kaweth.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index c4c334d9770f..a3eb7be51d53 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c | |||
@@ -1156,13 +1156,13 @@ err_fw: | |||
1156 | if (!kaweth->irq_urb) | 1156 | if (!kaweth->irq_urb) |
1157 | goto err_tx_and_rx; | 1157 | goto err_tx_and_rx; |
1158 | 1158 | ||
1159 | kaweth->intbuffer = usb_buffer_alloc( kaweth->dev, | 1159 | kaweth->intbuffer = usb_alloc_coherent( kaweth->dev, |
1160 | INTBUFFERSIZE, | 1160 | INTBUFFERSIZE, |
1161 | GFP_KERNEL, | 1161 | GFP_KERNEL, |
1162 | &kaweth->intbufferhandle); | 1162 | &kaweth->intbufferhandle); |
1163 | if (!kaweth->intbuffer) | 1163 | if (!kaweth->intbuffer) |
1164 | goto err_tx_and_rx_and_irq; | 1164 | goto err_tx_and_rx_and_irq; |
1165 | kaweth->rx_buf = usb_buffer_alloc( kaweth->dev, | 1165 | kaweth->rx_buf = usb_alloc_coherent( kaweth->dev, |
1166 | KAWETH_BUF_SIZE, | 1166 | KAWETH_BUF_SIZE, |
1167 | GFP_KERNEL, | 1167 | GFP_KERNEL, |
1168 | &kaweth->rxbufferhandle); | 1168 | &kaweth->rxbufferhandle); |
@@ -1203,9 +1203,9 @@ err_fw: | |||
1203 | 1203 | ||
1204 | err_intfdata: | 1204 | err_intfdata: |
1205 | usb_set_intfdata(intf, NULL); | 1205 | usb_set_intfdata(intf, NULL); |
1206 | usb_buffer_free(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle); | 1206 | usb_free_coherent(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle); |
1207 | err_all_but_rxbuf: | 1207 | err_all_but_rxbuf: |
1208 | usb_buffer_free(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle); | 1208 | usb_free_coherent(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle); |
1209 | err_tx_and_rx_and_irq: | 1209 | err_tx_and_rx_and_irq: |
1210 | usb_free_urb(kaweth->irq_urb); | 1210 | usb_free_urb(kaweth->irq_urb); |
1211 | err_tx_and_rx: | 1211 | err_tx_and_rx: |
@@ -1242,8 +1242,8 @@ static void kaweth_disconnect(struct usb_interface *intf) | |||
1242 | usb_free_urb(kaweth->tx_urb); | 1242 | usb_free_urb(kaweth->tx_urb); |
1243 | usb_free_urb(kaweth->irq_urb); | 1243 | usb_free_urb(kaweth->irq_urb); |
1244 | 1244 | ||
1245 | usb_buffer_free(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle); | 1245 | usb_free_coherent(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle); |
1246 | usb_buffer_free(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle); | 1246 | usb_free_coherent(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle); |
1247 | 1247 | ||
1248 | free_netdev(netdev); | 1248 | free_netdev(netdev); |
1249 | } | 1249 | } |