Commit e4a7ca29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (36 commits)
  USB: Driver for Freescale QUICC Engine USB Host Controller
  USB: option: add QUANTA HSDPA Data Card device ids
  USB: storage: Add another unusual_dev for off-by-one bug
  USB: unusual_dev: usb-storage needs to ignore a device
  USB: GADGET: fix !x & y
  USB: new id for ti_usb_3410_5052 driver
  USB: cdc-acm: Add another conexant modem to the quirks
  USB: 'option' driver - onda device MT503HS has wrong id
  USB: Remove ZTE modem from unusual_devices
  USB: storage: support of Dane-Elec MediaTouch USB device
  USB: usbmon: Implement compat_ioctl
  USB: add kernel-doc for wusb_dev in struct usb_device
  USB: ftdi_sio driver support of bar code scanner from Diebold
  USB: ftdi_sio: added Alti-2 VID and Neptune 3 PID
  USB: cp2101 device
  USB: usblp.c: add USBLP_QUIRK_BIDIR to Brother HL-1440
  USB: remove vernier labpro from ldusb
  USB: CDC-ACM quirk for MTK GPS
  USB: cdc-acm: support some gps data loggers
  USB: composite: Fix bug: low byte of w_index is the usb interface number not the whole 2 bytes of w_index
  ...
parents 843c04a0 236dd4d1

arch/arm/mach-davinci/usb.c

+0 −23
Original line number Diff line number Diff line
@@ -77,29 +77,6 @@ static struct platform_device usb_dev = { 
	.num_resources  = ARRAY_SIZE(usb_resources),

};



#ifdef CONFIG_USB_MUSB_OTG



static struct otg_transceiver *xceiv;



struct otg_transceiver *otg_get_transceiver(void)

{

	if (xceiv)

		get_device(xceiv->dev);

	return xceiv;

}

EXPORT_SYMBOL(otg_get_transceiver);



int otg_set_transceiver(struct otg_transceiver *x)

{

	if (xceiv && x)

		return -EBUSY;

	xceiv = x;

	return 0;

}

EXPORT_SYMBOL(otg_set_transceiver);



#endif



void __init setup_usb(unsigned mA, unsigned potpgt_msec)

{

	usb_data.power = mA / 2;

drivers/usb/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_USB_EHCI_HCD) += host/ 
obj-$(CONFIG_USB_ISP116X_HCD)	+= host/

obj-$(CONFIG_USB_OHCI_HCD)	+= host/

obj-$(CONFIG_USB_UHCI_HCD)	+= host/

obj-$(CONFIG_USB_FHCI_HCD)	+= host/

obj-$(CONFIG_USB_SL811_HCD)	+= host/

obj-$(CONFIG_USB_U132_HCD)	+= host/

obj-$(CONFIG_USB_R8A66597_HCD)	+= host/

drivers/usb/class/cdc-acm.c

+9 −0
Original line number Diff line number Diff line
@@ -1349,6 +1349,12 @@ static struct usb_device_id acm_ids[] = { 
	{ USB_DEVICE(0x0e8d, 0x0003), /* FIREFLY, MediaTek Inc; andrey.arapov@gmail.com */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x0e8d, 0x3329), /* i-blue 747, Qstarz BT-Q1000, Holux M-241 */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x0e8d, 0x3329), /* MediaTek Inc GPS */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x0482, 0x0203), /* KYOCERA AH-K3001V */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},
@@ -1370,6 +1376,9 @@ static struct usb_device_id acm_ids[] = { 
	{ USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x0572, 0x1324), /* Conexant USB MODEM RD02-D400 */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},



	/* control interfaces with various AT-command sets */

	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,

drivers/usb/class/usblp.c

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ static const struct quirk_printer_struct quirk_printers[] = { 
	{ 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */

	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */

	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */

	{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */

	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Printer M129C */

	{ 0, 0 }

};

drivers/usb/core/devio.c

+12 −8
Original line number Diff line number Diff line
@@ -1700,7 +1700,7 @@ const struct file_operations usbdev_file_operations = { 
	.release =	usbdev_release,

};



void usb_fs_classdev_common_remove(struct usb_device *udev)

static void usbdev_remove(struct usb_device *udev)

{

	struct dev_state *ps;

	struct siginfo sinfo;
@@ -1742,10 +1742,15 @@ static void usb_classdev_remove(struct usb_device *dev) 
{

	if (dev->usb_classdev)

		device_unregister(dev->usb_classdev);

	usb_fs_classdev_common_remove(dev);

}



static int usb_classdev_notify(struct notifier_block *self,

#else

#define usb_classdev_add(dev)		0

#define usb_classdev_remove(dev)	do {} while (0)



#endif



static int usbdev_notify(struct notifier_block *self,

			       unsigned long action, void *dev)

{

	switch (action) {
@@ -1755,15 +1760,15 @@ static int usb_classdev_notify(struct notifier_block *self, 
		break;

	case USB_DEVICE_REMOVE:

		usb_classdev_remove(dev);

		usbdev_remove(dev);

		break;

	}

	return NOTIFY_OK;

}



static struct notifier_block usbdev_nb = {

	.notifier_call = 	usb_classdev_notify,

	.notifier_call = 	usbdev_notify,

};

#endif



static struct cdev usb_device_cdev;
@@ -1798,9 +1803,8 @@ int __init usb_devio_init(void) 
	 * to /sys/dev

	 */

	usb_classdev_class->dev_kobj = NULL;



	usb_register_notify(&usbdev_nb);

#endif

	usb_register_notify(&usbdev_nb);

out:

	return retval;
@@ -1811,8 +1815,8 @@ error_cdev: 


void usb_devio_cleanup(void)

{

#ifdef CONFIG_USB_DEVICE_CLASS

	usb_unregister_notify(&usbdev_nb);

#ifdef CONFIG_USB_DEVICE_CLASS

	class_destroy(usb_classdev_class);

#endif

	cdev_del(&usb_device_cdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE