Merge gregkh@kernel.bkbits.net:linux/linus-2.6

into kroah.com:/home/greg/linux/BK/gregkh-2.6

drivers/usb/Makefile

@@ -35,6 +35,7 @@ obj-$(CONFIG_USB_SE401)		+= media/
 obj-$(CONFIG_USB_STV680)	+= media/
 obj-$(CONFIG_USB_VICAM)		+= media/
 
+obj-$(CONFIG_USB_AX8817X)	+= net/
 obj-$(CONFIG_USB_CATC)		+= net/
 obj-$(CONFIG_USB_KAWETH)	+= net/
 obj-$(CONFIG_USB_PEGASUS)	+= net/

drivers/usb/class/audio.c

@@ -2953,6 +2953,8 @@ static void usb_audio_parsestreaming(struct usb_audio_state *s, unsigned char *b
 			if (alts->desc.bInterfaceClass != USB_CLASS_AUDIO || alts->desc.bInterfaceSubClass != 2)
 				continue;
 			if (alts->desc.bNumEndpoints < 1) {
+				/* altsetting 0 should never have iso EPs */
+				if (alts->desc.bAlternateSetting != 0)
 				printk(KERN_ERR "usbaudio: device %u interface %u altsetting %u does not have an endpoint\n", 
 				       dev->devnum, asifout, i);
 				continue;
@@ -3872,9 +3874,10 @@ static void usb_audio_disconnect(struct usb_interface *intf)
 
 static int __init usb_audio_init(void)
 {
-	usb_register(&usb_audio_driver);
+	int result = usb_register(&usb_audio_driver);
+	if (result == 0) 
 		info(DRIVER_VERSION ":" DRIVER_DESC);
-	return 0;
+	return result;
 }
 
 

drivers/usb/core/hcd.c

@@ -1273,7 +1273,6 @@ static int hcd_unlink_urb (struct urb *urb)
  */
 static void hcd_endpoint_disable (struct usb_device *udev, int endpoint)
 {
-	unsigned long	flags;
 	struct hcd_dev	*dev;
 	struct usb_hcd	*hcd;
 	struct urb	*urb;
@@ -1282,6 +1281,8 @@ static void hcd_endpoint_disable (struct usb_device *udev, int endpoint)
 	dev = udev->hcpriv;
 	hcd = udev->bus->hcpriv;
 
+	local_irq_disable ();
+
 rescan:
 	/* (re)block new requests, as best we can */
 	if (endpoint & USB_DIR_IN) {
@@ -1293,7 +1294,6 @@ static void hcd_endpoint_disable (struct usb_device *udev, int endpoint)
 	}
 
 	/* then kill any current requests */
-	local_irq_save (flags);
 	spin_lock (&hcd_data_lock);
 	list_for_each_entry (urb, &dev->urb_list, urb_list) {
 		int	tmp = urb->pipe;
@@ -1342,7 +1342,7 @@ static void hcd_endpoint_disable (struct usb_device *udev, int endpoint)
 		goto rescan;
 	}
 	spin_unlock (&hcd_data_lock);
-	local_irq_restore (flags);
+	local_irq_enable ();
 
 	/* synchronize with the hardware, so old configuration state
 	 * clears out immediately (and will be freed).

drivers/usb/gadget/net2280.c

@@ -2664,7 +2664,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
 
 /*-------------------------------------------------------------------------*/
 
-static struct pci_device_id __devinitdata pci_ids [] = { {
+static struct pci_device_id pci_ids [] = { {
 	.class = 	((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
 	.class_mask = 	~0,
 	.vendor =	0x17cc,

drivers/usb/host/ehci-hcd.c

@@ -974,7 +974,7 @@ static const struct hc_driver ehci_driver = {
 /* EHCI spec says PCI is required. */
 
 /* PCI driver selection metadata; PCI hotplugging uses this */
-static struct pci_device_id __devinitdata pci_ids [] = { {
+static struct pci_device_id pci_ids [] = { {
 
 	/* handle any USB 2.0 EHCI controller */
 

drivers/usb/host/ohci-pci.c

@@ -351,7 +351,7 @@ static const struct hc_driver ohci_pci_hc_driver = {
 /*-------------------------------------------------------------------------*/
 
 
-static const struct pci_device_id __devinitdata pci_ids [] = { {
+static const struct pci_device_id pci_ids [] = { {
 
 	/* handle any USB OHCI controller */
 	.class =	(PCI_CLASS_SERIAL_USB << 8) | 0x10,

drivers/usb/host/uhci-hcd.c

@@ -2503,7 +2503,7 @@ static const struct hc_driver uhci_driver = {
 	.hub_control =		uhci_hub_control,
 };
 
-static const struct pci_device_id __devinitdata uhci_pci_ids[] = { {
+static const struct pci_device_id uhci_pci_ids[] = { {
 
 	/* handle any USB UHCI controller */
 	.class = 		((PCI_CLASS_SERIAL_USB << 8) | 0x00),

drivers/usb/input/aiptek.c

@@ -367,10 +367,12 @@ static struct usb_driver aiptek_driver = {
 static int __init
 aiptek_init(void)
 {
-	usb_register(&aiptek_driver);
+	int result = usb_register(&aiptek_driver);
+	if (result == 0) {
 		info(DRIVER_VERSION " " DRIVER_AUTHOR);
 		info(DRIVER_DESC);
-	return 0;
+	}
+	return result;
 }
 
 static void __exit

drivers/usb/input/usbkbd.c

@@ -366,9 +366,10 @@ static struct usb_driver usb_kbd_driver = {
 
 static int __init usb_kbd_init(void)
 {
-	usb_register(&usb_kbd_driver);
+	int result = usb_register(&usb_kbd_driver);
+	if (result == 0)
 		info(DRIVER_VERSION ":" DRIVER_DESC);
-	return 0;
+	return result;
 }
 
 static void __exit usb_kbd_exit(void)

drivers/usb/input/wacom.c

@@ -629,9 +629,10 @@ static struct usb_driver wacom_driver = {
 
 static int __init wacom_init(void)
 {
-	usb_register(&wacom_driver);
+	int result = usb_register(&wacom_driver);
+	if (result == 0)
 		info(DRIVER_VERSION ":" DRIVER_DESC);
-	return 0;
+	return result;
 }
 
 static void __exit wacom_exit(void)

drivers/usb/input/xpad.c

@@ -342,9 +342,10 @@ static struct usb_driver xpad_driver = {
 
 static int __init usb_xpad_init(void)
 {
-	usb_register(&xpad_driver);
+	int result = usb_register(&xpad_driver);
+	if (result == 0)
 		info(DRIVER_DESC ":" DRIVER_VERSION);
-	return 0;
+	return result;
 }
 
 static void __exit usb_xpad_exit(void)

drivers/usb/misc/emi26.c

@@ -201,7 +201,7 @@ static int emi26_load_firmware (struct usb_device *dev)
 	return err;
 }
 
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
 	{ USB_DEVICE(EMI26_VENDOR_ID, EMI26_PRODUCT_ID) },
 	{ }                                             /* Terminating entry */
 };
@@ -231,13 +231,12 @@ struct usb_driver emi26_driver = {
 	.name		= "emi26 - firmware loader",
 	.probe		= emi26_probe,
 	.disconnect	= emi26_disconnect,
-	.id_table	= NULL,
+	.id_table	= id_table,
 };
 
 static int __init emi26_init (void)
 {
-	usb_register (&emi26_driver);
-	return 0;
+	return usb_register(&emi26_driver);
 }
 
 static void __exit emi26_exit (void)

drivers/usb/net/ax8817x.c

@@ -158,7 +158,7 @@ struct ax8817x_info {
 };
 
 
-const struct usb_device_id ax8817x_id_table[] __devinitdata = {
+const struct usb_device_id ax8817x_id_table[] = {
 	/* Linksys USB200M */
       {USB_DEVICE(0x077b, 0x2226), driver_info:0x00130103},
 	/* Hawking UF200, TRENDnet TU2-ET100 */
@@ -1239,7 +1239,7 @@ static int ax8817x_bind(struct usb_interface *intf,
 
 	usb_fill_int_urb(ax_info->int_urb, usb, usb_rcvintpipe(usb, 1),
 			 ax_info->int_buf, 8, ax_int_callback, ax_info,
-			 100);
+			 usb->speed == USB_SPEED_HIGH? 8: 100);
 
 	ret = usb_submit_urb(ax_info->int_urb, GFP_ATOMIC);
 	if (ret < 0) {

drivers/usb/serial/ftdi_sio.c

@@ -392,7 +392,7 @@ static struct usb_device_id id_table_HE_TIRA1 [] = {
 };
 
 
-static __devinitdata struct usb_device_id id_table_combined [] = {
+static struct usb_device_id id_table_combined [] = {
 	{ USB_DEVICE(FTDI_VID, FTDI_SIO_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_RELAIS_PID) },