From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 May 2010 04:26:12 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
X-Git-Tag: v2.6.35-rc1~471
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a9b149212f3716c598afe973b6261fd58453b7a;p=platform%2Fkernel%2Flinux-stable.git

Merge git://git./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
---

7a9b149212f3716c598afe973b6261fd58453b7a
diff --cc drivers/input/tablet/acecad.c
index 37d0539,c047016..aea9a93
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@@ -246,11 -252,13 +246,11 @@@ static void usb_acecad_disconnect(struc
  	struct usb_acecad *acecad = usb_get_intfdata(intf);
  
  	usb_set_intfdata(intf, NULL);
 -	if (acecad) {
 -		usb_kill_urb(acecad->irq);
 -		input_unregister_device(acecad->input);
 -		usb_free_urb(acecad->irq);
 -		usb_free_coherent(interface_to_usbdev(intf), 10, acecad->data, acecad->data_dma);
 -		kfree(acecad);
 -	}
 +
 +	input_unregister_device(acecad->input);
 +	usb_free_urb(acecad->irq);
- 	usb_buffer_free(acecad->usbdev, 8, acecad->data, acecad->data_dma);
++	usb_free_coherent(acecad->usbdev, 8, acecad->data, acecad->data_dma);
 +	kfree(acecad);
  }
  
  static struct usb_device_id usb_acecad_id_table [] = {
diff --cc drivers/input/tablet/kbtab.c
index b9969f1,d31b9c7..290f4e5
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@@ -173,7 -182,7 +173,7 @@@ static int kbtab_probe(struct usb_inter
  	return 0;
  
   fail3:	usb_free_urb(kbtab->irq);
-  fail2:	usb_buffer_free(dev, 8, kbtab->data, kbtab->data_dma);
 - fail2:	usb_free_coherent(dev, 10, kbtab->data, kbtab->data_dma);
++ fail2:	usb_free_coherent(dev, 8, kbtab->data, kbtab->data_dma);
   fail1:	input_free_device(input_dev);
  	kfree(kbtab);
  	return error;
@@@ -184,11 -193,13 +184,11 @@@ static void kbtab_disconnect(struct usb
  	struct kbtab *kbtab = usb_get_intfdata(intf);
  
  	usb_set_intfdata(intf, NULL);
 -	if (kbtab) {
 -		usb_kill_urb(kbtab->irq);
 -		input_unregister_device(kbtab->dev);
 -		usb_free_urb(kbtab->irq);
 -		usb_free_coherent(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma);
 -		kfree(kbtab);
 -	}
 +
 +	input_unregister_device(kbtab->dev);
 +	usb_free_urb(kbtab->irq);
- 	usb_buffer_free(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
++	usb_free_coherent(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
 +	kfree(kbtab);
  }
  
  static struct usb_driver kbtab_driver = {
diff --cc drivers/input/tablet/wacom_sys.c
index d90f4e0,191197c..2dc0c07
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@@ -534,11 -632,11 +534,11 @@@ static int wacom_probe(struct usb_inter
  	usb_set_intfdata(intf, wacom);
  	return 0;
  
 + fail4:	wacom_remove_shared_data(wacom_wac);
   fail3:	usb_free_urb(wacom->irq);
-  fail2:	usb_buffer_free(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
+  fail2:	usb_free_coherent(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
   fail1:	input_free_device(input_dev);
  	kfree(wacom);
 -	kfree(wacom_wac);
  	return error;
  }
  
@@@ -549,11 -647,11 +549,11 @@@ static void wacom_disconnect(struct usb
  	usb_set_intfdata(intf, NULL);
  
  	usb_kill_urb(wacom->irq);
 -	input_unregister_device(wacom->dev);
 +	input_unregister_device(wacom->wacom_wac.input);
  	usb_free_urb(wacom->irq);
- 	usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
+ 	usb_free_coherent(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
 -			  wacom->wacom_wac->data, wacom->data_dma);
 -	kfree(wacom->wacom_wac);
 +			wacom->wacom_wac.data, wacom->data_dma);
 +	wacom_remove_shared_data(&wacom->wacom_wac);
  	kfree(wacom);
  }
  
diff --cc drivers/media/video/gspca/gspca.c
index efe6159,00713f8..678675b
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@@ -213,7 -213,7 +213,7 @@@ static int alloc_and_submit_int_urb(str
  		goto error;
  	}
  
- 	buffer = usb_buffer_alloc(dev, buffer_len,
 -	buffer = usb_alloc_coherent(dev, ep->wMaxPacketSize,
++	buffer = usb_alloc_coherent(dev, buffer_len,
  				GFP_KERNEL, &urb->transfer_dma);
  	if (!buffer) {
  		ret = -ENOMEM;