diff options
Diffstat (limited to 'drivers/usb/storage/onetouch.c')
-rw-r--r-- | drivers/usb/storage/onetouch.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c index 198bb3ed95b2..1943be5a2914 100644 --- a/drivers/usb/storage/onetouch.c +++ b/drivers/usb/storage/onetouch.c | |||
@@ -201,8 +201,8 @@ static int onetouch_connect_input(struct us_data *ss) | |||
201 | if (!onetouch || !input_dev) | 201 | if (!onetouch || !input_dev) |
202 | goto fail1; | 202 | goto fail1; |
203 | 203 | ||
204 | onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN, | 204 | onetouch->data = usb_alloc_coherent(udev, ONETOUCH_PKT_LEN, |
205 | GFP_KERNEL, &onetouch->data_dma); | 205 | GFP_KERNEL, &onetouch->data_dma); |
206 | if (!onetouch->data) | 206 | if (!onetouch->data) |
207 | goto fail1; | 207 | goto fail1; |
208 | 208 | ||
@@ -264,8 +264,8 @@ static int onetouch_connect_input(struct us_data *ss) | |||
264 | return 0; | 264 | return 0; |
265 | 265 | ||
266 | fail3: usb_free_urb(onetouch->irq); | 266 | fail3: usb_free_urb(onetouch->irq); |
267 | fail2: usb_buffer_free(udev, ONETOUCH_PKT_LEN, | 267 | fail2: usb_free_coherent(udev, ONETOUCH_PKT_LEN, |
268 | onetouch->data, onetouch->data_dma); | 268 | onetouch->data, onetouch->data_dma); |
269 | fail1: kfree(onetouch); | 269 | fail1: kfree(onetouch); |
270 | input_free_device(input_dev); | 270 | input_free_device(input_dev); |
271 | return error; | 271 | return error; |
@@ -279,8 +279,8 @@ static void onetouch_release_input(void *onetouch_) | |||
279 | usb_kill_urb(onetouch->irq); | 279 | usb_kill_urb(onetouch->irq); |
280 | input_unregister_device(onetouch->dev); | 280 | input_unregister_device(onetouch->dev); |
281 | usb_free_urb(onetouch->irq); | 281 | usb_free_urb(onetouch->irq); |
282 | usb_buffer_free(onetouch->udev, ONETOUCH_PKT_LEN, | 282 | usb_free_coherent(onetouch->udev, ONETOUCH_PKT_LEN, |
283 | onetouch->data, onetouch->data_dma); | 283 | onetouch->data, onetouch->data_dma); |
284 | } | 284 | } |
285 | } | 285 | } |
286 | 286 | ||