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

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/media/video/tlg2300/pd-main.c b/drivers/media/video/tlg2300/pd-main.c
index c267e0cfb54b..256cc558ba13 100644
--- a/drivers/media/video/tlg2300/pd-main.c
+++ b/drivers/media/video/tlg2300/pd-main.c
@@ -454,8 +454,8 @@ static int poseidon_probe(struct usb_interface *interface,
 
         device_init_wakeup(&udev->dev, 1);
 #ifdef CONFIG_PM
-        pd->udev->autosuspend_disabled = 0;
         pd->udev->autosuspend_delay = HZ * PM_SUSPEND_DELAY;
+        usb_enable_autosuspend(pd->udev);
 
         if (in_hibernation(pd)) {
                 INIT_WORK(&pd->pm_work, hibernation_resume);
diff --git a/drivers/media/video/tlg2300/pd-video.c b/drivers/media/video/tlg2300/pd-video.c
index c750fd115ec4..d0cc012f7ae6 100644
--- a/drivers/media/video/tlg2300/pd-video.c
+++ b/drivers/media/video/tlg2300/pd-video.c
@@ -478,10 +478,10 @@ static int prepare_iso_urb(struct video_data *video)
                         goto out;
 
                 video->urb_array[i] = urb;
-                mem = usb_buffer_alloc(udev,
-                                        ISO_PKT_SIZE * PK_PER_URB,
-                                        GFP_KERNEL,
-                                        &urb->transfer_dma);
+                mem = usb_alloc_coherent(udev,
+                                         ISO_PKT_SIZE * PK_PER_URB,
+                                         GFP_KERNEL,
+                                         &urb->transfer_dma);
 
                 urb->complete   = urb_complete_iso;     /* handler */
                 urb->dev        = udev;
@@ -521,8 +521,8 @@ int alloc_bulk_urbs_generic(struct urb **urb_array, int num,
                 if (urb == NULL)
                         return i;
 
-                mem = usb_buffer_alloc(udev, buf_size, gfp_flags,
-                                        &urb->transfer_dma);
+                mem = usb_alloc_coherent(udev, buf_size, gfp_flags,
+                                         &urb->transfer_dma);
                 if (mem == NULL)
                         return i;
 
@@ -542,7 +542,7 @@ void free_all_urb_generic(struct urb **urb_array, int num)
         for (i = 0; i < num; i++) {
                 urb = urb_array[i];
                 if (urb) {
-                        usb_buffer_free(urb->dev,
+                        usb_free_coherent(urb->dev,
                                         urb->transfer_buffer_length,
                                         urb->transfer_buffer,
                                         urb->transfer_dma);