diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:26:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:26:12 -0400 |
commit | 7a9b149212f3716c598afe973b6261fd58453b7a (patch) | |
tree | 477716d84c71da124448b72278e98da28aadbd3d /drivers/input/tablet/acecad.c | |
parent | 3d62e3fdce8ef265a3706c52ae1ca6ab84e30f0e (diff) | |
parent | e26bcf37234c67624f62d9fc95f922b8dbda1363 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
USB: remove unused usb_buffer_alloc and usb_buffer_free macros
usb: musb: update gfp/slab.h includes
USB: ftdi_sio: fix legacy SIO-device header
USB: kl5usb105: reimplement using generic framework
USB: kl5usb105: minor clean ups
USB: kl5usb105: fix memory leak
USB: io_ti: use kfifo to implement write buffering
USB: io_ti: remove unsused private counter
USB: ti_usb: use kfifo to implement write buffering
USB: ir-usb: fix incorrect write-buffer length
USB: aircable: fix incorrect write-buffer length
USB: safe_serial: straighten out read processing
USB: safe_serial: reimplement read using generic framework
USB: safe_serial: reimplement write using generic framework
usb-storage: always print quirks
USB: usb-storage: trivial debug improvements
USB: oti6858: use port write fifo
USB: oti6858: use kfifo to implement write buffering
USB: cypress_m8: use kfifo to implement write buffering
USB: cypress_m8: remove unused drain define
...
Fix up conflicts (due to usb_buffer_alloc/free renaming) in
drivers/input/tablet/acecad.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c
drivers/media/video/gspca/gspca.c
sound/usb/usbaudio.c
Diffstat (limited to 'drivers/input/tablet/acecad.c')
-rw-r--r-- | drivers/input/tablet/acecad.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c index 37d0539fefa0..aea9a9399a36 100644 --- a/drivers/input/tablet/acecad.c +++ b/drivers/input/tablet/acecad.c | |||
@@ -155,7 +155,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ | |||
155 | goto fail1; | 155 | goto fail1; |
156 | } | 156 | } |
157 | 157 | ||
158 | acecad->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &acecad->data_dma); | 158 | acecad->data = usb_alloc_coherent(dev, 8, GFP_KERNEL, &acecad->data_dma); |
159 | if (!acecad->data) { | 159 | if (!acecad->data) { |
160 | err= -ENOMEM; | 160 | err= -ENOMEM; |
161 | goto fail1; | 161 | goto fail1; |
@@ -235,7 +235,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ | |||
235 | 235 | ||
236 | return 0; | 236 | return 0; |
237 | 237 | ||
238 | fail2: usb_buffer_free(dev, 8, acecad->data, acecad->data_dma); | 238 | fail2: usb_free_coherent(dev, 8, acecad->data, acecad->data_dma); |
239 | fail1: input_free_device(input_dev); | 239 | fail1: input_free_device(input_dev); |
240 | kfree(acecad); | 240 | kfree(acecad); |
241 | return err; | 241 | return err; |
@@ -249,7 +249,7 @@ static void usb_acecad_disconnect(struct usb_interface *intf) | |||
249 | 249 | ||
250 | input_unregister_device(acecad->input); | 250 | input_unregister_device(acecad->input); |
251 | usb_free_urb(acecad->irq); | 251 | usb_free_urb(acecad->irq); |
252 | usb_buffer_free(acecad->usbdev, 8, acecad->data, acecad->data_dma); | 252 | usb_free_coherent(acecad->usbdev, 8, acecad->data, acecad->data_dma); |
253 | kfree(acecad); | 253 | kfree(acecad); |
254 | } | 254 | } |
255 | 255 | ||