fbdev: intelfb: add support for the Intel Integrated Graphics Controller 965G/965GM

[safe/jmp/linux-2.6] / drivers / usb / core / quirks.c

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 739f520..2e20193 100644 (file)
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -28,24 +28,44 @@
  * devices is broken...
  */
 static const struct usb_device_id usb_quirk_list[] = {
+       /* CBM - Flash disk */
+       { USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME },
+
        /* HP 5300/5370C scanner */
-       { USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 },
-       /* Seiko Epson Corp - Perfection 1670 */
-       { USB_DEVICE(0x04b8, 0x011f), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
-       /* Elsa MicroLink 56k (V.250) */
-       { USB_DEVICE(0x05cc, 0x2267), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+       { USB_DEVICE(0x03f0, 0x0701), .driver_info =
+                       USB_QUIRK_STRING_FETCH_255 },
+
+       /* Creative SB Audigy 2 NX */
+       { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
+
+       /* Philips PSC805 audio device */
+       { USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },
+
+       /* Roland SC-8820 */
+       { USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },
+
+       /* Edirol SD-20 */
+       { USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME },
+
+       /* M-Systems Flash Disk Pioneers */
+       { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
+
+       /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */
+       { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },
+
+       /* Action Semiconductor flash disk */
+       { USB_DEVICE(0x10d6, 0x2200), .driver_info =
+                       USB_QUIRK_STRING_FETCH_255 },
+
+       /* SKYMEDI USB_DRIVE */
+       { USB_DEVICE(0x1516, 0x8628), .driver_info = USB_QUIRK_RESET_RESUME },
+
+       /* INTEL VALUE SSD */
+       { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
 
        { }  /* terminating entry must be last */
 };
 
-static void usb_autosuspend_quirk(struct usb_device *udev)
-{
-#ifdef CONFIG_USB_SUSPEND
-       /* disable autosuspend, but allow the user to re-enable it via sysfs */
-       udev->autosuspend_disabled = 1;
-#endif
-}
-
 static const struct usb_device_id *find_id(struct usb_device *udev)
 {
        const struct usb_device_id *id = usb_quirk_list;
@@ -72,7 +92,23 @@ void usb_detect_quirks(struct usb_device *udev)
                dev_dbg(&udev->dev, "USB quirks for this device: %x\n",
                                udev->quirks);
 
-       /* do any special quirk handling here if needed */
-       if (udev->quirks & USB_QUIRK_NO_AUTOSUSPEND)
-               usb_autosuspend_quirk(udev);
+       /* By default, disable autosuspend for all non-hubs */
+#ifdef CONFIG_USB_SUSPEND
+       if (udev->descriptor.bDeviceClass != USB_CLASS_HUB)
+               udev->autosuspend_disabled = 1;
+#endif
+
+       /* For the present, all devices default to USB-PERSIST enabled */
+#if 0          /* was: #ifdef CONFIG_PM */
+       /* Hubs are automatically enabled for USB-PERSIST */
+       if (udev->descriptor.bDeviceClass == USB_CLASS_HUB)
+               udev->persist_enabled = 1;
+
+#else
+       /* In the absence of PM, we can safely enable USB-PERSIST
+        * for all devices.  It will affect things like hub resets
+        * and EMF-related port disables.
+        */
+       udev->persist_enabled = 1;
+#endif /* CONFIG_PM */
 }