Greg KH wrote: > Here's some USB fixes for your 2.6.30-rc4 tree. > > More device ids, and some bugfixes for problems that people have > reported recently. > > Please pull from: > master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/ > > All of these patches have been in the -next and -mm releases for a while. > > The full patches will be sent to the linux-usb mailing list, if anyone > wants to see them. > > thanks, > > greg k-h > > ------------ > > drivers/usb/Makefile | 2 ++ > drivers/usb/atm/cxacru.c | 10 ++++++++-- > drivers/usb/gadget/usbstring.c | 6 +++--- > drivers/usb/serial/ftdi_sio.c | 20 ++++++++++++++++---- > drivers/usb/serial/ftdi_sio.h | 6 ++++++ > drivers/usb/storage/unusual_devs.h | 5 +++-- > 6 files changed, 38 insertions(+), 11 deletions(-) > > --------------- > > Alan Stern (2): > USB: Gadget: fix UTF conversion in the usbstring library > usb-serial: ftdi_sio: fix reference counting of ftdi_private > > Andy Lutomirski (1): > USB: Fix makefile so that CONFIG_WDM and CONFIG_TMC work. > > Nicolas Pitre (1): > USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug > > Phil Dibowitz (1): > USB: unusual_devs: extend nokia 6288 bcd range > > Simon Arlott (1): > USB: cxacru: Fix negative dB output > > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > > Still missing, the following patch submitted by Alan Stern to Jiri Kosina. Index: usb-2.6/drivers/hid/hid-ids.h =================================================================== --- usb-2.6.orig/drivers/hid/hid-ids.h +++ usb-2.6/drivers/hid/hid-ids.h @@ -113,6 +113,11 @@ #define USB_VENDOR_ID_BERKSHIRE 0x0c98 #define USB_DEVICE_ID_BERKSHIRE_PCWD 0x1140 +#define USB_VENDOR_ID_CH 0x068e +#define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2 +#define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4 +#define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE 0x00ff + #define USB_VENDOR_ID_CHERRY 0x046a #define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023 Index: usb-2.6/drivers/hid/usbhid/hid-quirks.c =================================================================== --- usb-2.6.orig/drivers/hid/usbhid/hid-quirks.c +++ usb-2.6/drivers/hid/usbhid/hid-quirks.c @@ -50,6 +50,9 @@ static const struct hid_blacklist { { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, Regards Sid. -- Sid Boyce ... Hamradio License G3VBV, Licensed Private Pilot Emeritus IBM/Amdahl Mainframes and Sun/Fujitsu Servers Tech Support Specialist, Cricket Coach Microsoft Windows Free Zone - Linux used for all Computing Tasks -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
