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

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

parents 108dff7d 16f05be7

drivers/usb/host/pci-quirks.c

+12 −4
Original line number Diff line number Diff line
@@ -191,8 +191,9 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev) 
		}

		if (wait_time <= 0)

			printk(KERN_WARNING "%s %s: BIOS handoff "

					"failed (BIOS bug ?)\n",

					pdev->dev.bus_id, "OHCI");

					"failed (BIOS bug ?) %08x\n",

					pdev->dev.bus_id, "OHCI",

					readl(base + OHCI_CONTROL));



		/* reset controller, preserving RWC */

		writel(control & OHCI_CTRL_RWC, base + OHCI_CONTROL);
@@ -243,6 +244,12 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) 
				pr_debug("%s %s: BIOS handoff\n",

						pdev->dev.bus_id, "EHCI");



#if 0

/* aleksey_gorelov@phoenix.com reports that some systems need SMI forced on,

 * but that seems dubious in general (the BIOS left it off intentionally)

 * and is known to prevent some systems from booting.  so we won't do this

 * unless maybe we can determine when we're on a system that needs SMI forced.

 */

				/* BIOS workaround (?): be sure the

				 * pre-Linux code receives the SMI

				 */
@@ -252,6 +259,7 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) 
				pci_write_config_dword(pdev,

						offset + EHCI_USBLEGCTLSTS,

						val | EHCI_USBLEGCTLSTS_SOOE);

#endif

			}



			/* always say Linux will own the hardware
@@ -274,8 +282,8 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) 
				 * it down, and hope nothing goes too wrong

				 */

				printk(KERN_WARNING "%s %s: BIOS handoff "

						"failed (BIOS bug ?)\n",

					pdev->dev.bus_id, "EHCI");

						"failed (BIOS bug ?) %08x\n",

					pdev->dev.bus_id, "EHCI", cap);

				pci_write_config_byte(pdev, offset + 2, 0);

			}

drivers/usb/host/sl811_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static struct resource resources[] = { 
	},

};



extern struct device_driver sl811h_driver;

extern struct platform_driver sl811h_driver;



static struct platform_device platform_dev = {

	.id			= -1,
@@ -132,7 +132,7 @@ static int sl811_hc_init(struct device *parent, ioaddr_t base_addr, int irq) 
	 * initialized already because of the link order dependency created

	 * by referencing "sl811h_driver".

	 */

	platform_dev.name = sl811h_driver.name;

	platform_dev.name = sl811h_driver.driver.name;

	return platform_device_register(&platform_dev);

}

drivers/usb/input/hid-core.c

+28 −22
Original line number Diff line number Diff line
@@ -1435,17 +1435,20 @@ void hid_init_reports(struct hid_device *hid) 
#define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004



#define USB_VENDOR_ID_LD		0x0f11

#define USB_DEVICE_ID_CASSY		0x1000

#define USB_DEVICE_ID_POCKETCASSY	0x1010

#define USB_DEVICE_ID_MOBILECASSY	0x1020

#define USB_DEVICE_ID_JWM		0x1080

#define USB_DEVICE_ID_DMMP		0x1081

#define USB_DEVICE_ID_UMIP		0x1090

#define USB_DEVICE_ID_VIDEOCOM		0x1200

#define USB_DEVICE_ID_COM3LAB		0x2000

#define USB_DEVICE_ID_TELEPORT		0x2010

#define USB_DEVICE_ID_NETWORKANALYSER	0x2020

#define USB_DEVICE_ID_POWERCONTROL	0x2030

#define USB_DEVICE_ID_LD_CASSY		0x1000

#define USB_DEVICE_ID_LD_POCKETCASSY	0x1010

#define USB_DEVICE_ID_LD_MOBILECASSY	0x1020

#define USB_DEVICE_ID_LD_JWM		0x1080

#define USB_DEVICE_ID_LD_DMMP		0x1081

#define USB_DEVICE_ID_LD_UMIP		0x1090

#define USB_DEVICE_ID_LD_XRAY1		0x1100

#define USB_DEVICE_ID_LD_XRAY2		0x1101

#define USB_DEVICE_ID_LD_VIDEOCOM	0x1200

#define USB_DEVICE_ID_LD_COM3LAB	0x2000

#define USB_DEVICE_ID_LD_TELEPORT	0x2010

#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020

#define USB_DEVICE_ID_LD_POWERCONTROL	0x2030

#define USB_DEVICE_ID_LD_MACHINETEST	0x2040



#define USB_VENDOR_ID_APPLE		0x05ac

#define USB_DEVICE_ID_APPLE_POWERMOUSE	0x0304
@@ -1491,17 +1494,20 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_CASSY, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_POCKETCASSY, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_MOBILECASSY, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_JWM, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_DMMP, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_UMIP, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_VIDEOCOM, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_COM3LAB, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_TELEPORT, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_NETWORKANALYSER, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_POWERCONTROL, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_IGNORE },

drivers/usb/misc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ source "drivers/usb/misc/sisusbvga/Kconfig" 


config USB_LD

	tristate "USB LD driver"

	depends on USB && EXPERIMENTAL

	depends on USB

	help

	  This driver is for generic USB devices that use interrupt transfers,

	  like LD Didactic's USB devices.

drivers/usb/misc/ldusb.c

+32 −25
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 * V0.1  (mh) Initial version

 * V0.11 (mh) Added raw support for HID 1.0 devices (no interrupt out endpoint)

 * V0.12 (mh) Added kmalloc check for string buffer

 * V0.13 (mh) Added support for LD X-Ray and Machine Test System

 */



#include <linux/config.h>
@@ -40,17 +41,20 @@ 


/* Define these values to match your devices */

#define USB_VENDOR_ID_LD		0x0f11	/* USB Vendor ID of LD Didactic GmbH */

#define USB_DEVICE_ID_CASSY		0x1000	/* USB Product ID for all CASSY-S modules */

#define USB_DEVICE_ID_POCKETCASSY	0x1010	/* USB Product ID for Pocket-CASSY */

#define USB_DEVICE_ID_MOBILECASSY	0x1020	/* USB Product ID for Mobile-CASSY */

#define USB_DEVICE_ID_JWM		0x1080	/* USB Product ID for Joule and Wattmeter */

#define USB_DEVICE_ID_DMMP		0x1081	/* USB Product ID for Digital Multimeter P (reserved) */

#define USB_DEVICE_ID_UMIP		0x1090	/* USB Product ID for UMI P */

#define USB_DEVICE_ID_VIDEOCOM		0x1200	/* USB Product ID for VideoCom */

#define USB_DEVICE_ID_COM3LAB		0x2000	/* USB Product ID for COM3LAB */

#define USB_DEVICE_ID_TELEPORT		0x2010	/* USB Product ID for Terminal Adapter */

#define USB_DEVICE_ID_NETWORKANALYSER	0x2020	/* USB Product ID for Network Analyser */

#define USB_DEVICE_ID_POWERCONTROL	0x2030	/* USB Product ID for Controlling device for Power Electronics */

#define USB_DEVICE_ID_LD_CASSY		0x1000	/* USB Product ID of CASSY-S */

#define USB_DEVICE_ID_LD_POCKETCASSY	0x1010	/* USB Product ID of Pocket-CASSY */

#define USB_DEVICE_ID_LD_MOBILECASSY	0x1020	/* USB Product ID of Mobile-CASSY */

#define USB_DEVICE_ID_LD_JWM		0x1080	/* USB Product ID of Joule and Wattmeter */

#define USB_DEVICE_ID_LD_DMMP		0x1081	/* USB Product ID of Digital Multimeter P (reserved) */

#define USB_DEVICE_ID_LD_UMIP		0x1090	/* USB Product ID of UMI P */

#define USB_DEVICE_ID_LD_XRAY1		0x1100	/* USB Product ID of X-Ray Apparatus */

#define USB_DEVICE_ID_LD_XRAY2		0x1101	/* USB Product ID of X-Ray Apparatus */

#define USB_DEVICE_ID_LD_VIDEOCOM	0x1200	/* USB Product ID of VideoCom */

#define USB_DEVICE_ID_LD_COM3LAB	0x2000	/* USB Product ID of COM3LAB */

#define USB_DEVICE_ID_LD_TELEPORT	0x2010	/* USB Product ID of Terminal Adapter */

#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020	/* USB Product ID of Network Analyser */

#define USB_DEVICE_ID_LD_POWERCONTROL	0x2030	/* USB Product ID of Converter Control Unit */

#define USB_DEVICE_ID_LD_MACHINETEST	0x2040	/* USB Product ID of Machine Test System */



#define USB_VENDOR_ID_VERNIER		0x08f7

#define USB_DEVICE_ID_VERNIER_LABPRO	0x0001
@@ -67,17 +71,20 @@ 


/* table of devices that work with this driver */

static struct usb_device_id ld_usb_table [] = {

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_CASSY) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_POCKETCASSY) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_MOBILECASSY) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_JWM) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_DMMP) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_UMIP) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_VIDEOCOM) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_COM3LAB) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_TELEPORT) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_NETWORKANALYSER) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_POWERCONTROL) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST) },

	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },

	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },

	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
@@ -85,7 +92,7 @@ static struct usb_device_id ld_usb_table [] = { 
	{ }					/* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, ld_usb_table);

MODULE_VERSION("V0.12");

MODULE_VERSION("V0.13");

MODULE_AUTHOR("Michael Hund <mhund@ld-didactic.de>");

MODULE_DESCRIPTION("LD USB Driver");

MODULE_LICENSE("GPL");
@@ -632,8 +639,8 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * 


	/* workaround for early firmware versions on fast computers */

	if ((le16_to_cpu(udev->descriptor.idVendor) == USB_VENDOR_ID_LD) &&

	    ((le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_CASSY) ||

	     (le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_COM3LAB)) &&

	    ((le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_LD_CASSY) ||

	     (le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_LD_COM3LAB)) &&

	    (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x103)) {

		buffer = kmalloc(256, GFP_KERNEL);

		if (buffer == NULL) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE