diff options
Diffstat (limited to 'drivers/net/usb/ipheth.c')
-rw-r--r-- | drivers/net/usb/ipheth.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index 418825d26f90..197c352c47fb 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c | |||
@@ -128,17 +128,13 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone) | |||
128 | if (rx_urb == NULL) | 128 | if (rx_urb == NULL) |
129 | goto free_tx_urb; | 129 | goto free_tx_urb; |
130 | 130 | ||
131 | tx_buf = usb_buffer_alloc(iphone->udev, | 131 | tx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE, |
132 | IPHETH_BUF_SIZE, | 132 | GFP_KERNEL, &tx_urb->transfer_dma); |
133 | GFP_KERNEL, | ||
134 | &tx_urb->transfer_dma); | ||
135 | if (tx_buf == NULL) | 133 | if (tx_buf == NULL) |
136 | goto free_rx_urb; | 134 | goto free_rx_urb; |
137 | 135 | ||
138 | rx_buf = usb_buffer_alloc(iphone->udev, | 136 | rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE, |
139 | IPHETH_BUF_SIZE, | 137 | GFP_KERNEL, &rx_urb->transfer_dma); |
140 | GFP_KERNEL, | ||
141 | &rx_urb->transfer_dma); | ||
142 | if (rx_buf == NULL) | 138 | if (rx_buf == NULL) |
143 | goto free_tx_buf; | 139 | goto free_tx_buf; |
144 | 140 | ||
@@ -150,8 +146,8 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone) | |||
150 | return 0; | 146 | return 0; |
151 | 147 | ||
152 | free_tx_buf: | 148 | free_tx_buf: |
153 | usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, tx_buf, | 149 | usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, tx_buf, |
154 | tx_urb->transfer_dma); | 150 | tx_urb->transfer_dma); |
155 | free_rx_urb: | 151 | free_rx_urb: |
156 | usb_free_urb(rx_urb); | 152 | usb_free_urb(rx_urb); |
157 | free_tx_urb: | 153 | free_tx_urb: |
@@ -162,10 +158,10 @@ error_nomem: | |||
162 | 158 | ||
163 | static void ipheth_free_urbs(struct ipheth_device *iphone) | 159 | static void ipheth_free_urbs(struct ipheth_device *iphone) |
164 | { | 160 | { |
165 | usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf, | 161 | usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf, |
166 | iphone->rx_urb->transfer_dma); | 162 | iphone->rx_urb->transfer_dma); |
167 | usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf, | 163 | usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf, |
168 | iphone->tx_urb->transfer_dma); | 164 | iphone->tx_urb->transfer_dma); |
169 | usb_free_urb(iphone->rx_urb); | 165 | usb_free_urb(iphone->rx_urb); |
170 | usb_free_urb(iphone->tx_urb); | 166 | usb_free_urb(iphone->tx_urb); |
171 | } | 167 | } |