Title: [9135] trunk: [!no_src_qa!] update to linux-2.6.34.7
- Revision
- 9135
- Author
- vapier
- Date
- 2010-09-13 13:50:37 -0400 (Mon, 13 Sep 2010)
Log Message
[!no_src_qa!] update to linux-2.6.34.7
Modified Paths
Diff
Modified: trunk/Makefile (9134 => 9135)
--- trunk/Makefile 2010-09-10 18:27:52 UTC (rev 9134)
+++ trunk/Makefile 2010-09-13 17:50:37 UTC (rev 9135)
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 34
-EXTRAVERSION = .6
+EXTRAVERSION = .7
NAME = Sheep on Meth
# *DOCUMENTATION*
Modified: trunk/drivers/usb/core/hub.c (9134 => 9135)
--- trunk/drivers/usb/core/hub.c 2010-09-10 18:27:52 UTC (rev 9134)
+++ trunk/drivers/usb/core/hub.c 2010-09-13 17:50:37 UTC (rev 9135)
@@ -23,7 +23,6 @@
#include <linux/mutex.h>
#include <linux/freezer.h>
#include <linux/pm_runtime.h>
-#include <linux/usb/quirks.h>
#include <asm/uaccess.h>
#include <asm/byteorder.h>
@@ -1791,6 +1790,7 @@
pm_runtime_set_active(&udev->dev);
pm_runtime_enable(&udev->dev);
+ usb_detect_quirks(udev);
err = usb_enumerate_device(udev); /* Read descriptors */
if (err < 0)
goto fail;
@@ -3100,10 +3100,6 @@
if (status < 0)
goto loop;
- usb_detect_quirks(udev);
- if (udev->quirks & USB_QUIRK_DELAY_INIT)
- msleep(1000);
-
/* consecutive bus-powered hubs aren't reliable; they can
* violate the voltage drop budget. if the new child has
* a "powered" LED, users should notice we didn't enable it
Modified: trunk/drivers/usb/core/quirks.c (9134 => 9135)
--- trunk/drivers/usb/core/quirks.c 2010-09-10 18:27:52 UTC (rev 9134)
+++ trunk/drivers/usb/core/quirks.c 2010-09-13 17:50:37 UTC (rev 9135)
@@ -38,9 +38,6 @@
/* Creative SB Audigy 2 NX */
{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
- /* Logitech Harmony 700-series */
- { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
-
/* Philips PSC805 audio device */
{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },
Modified: trunk/include/linux/usb/quirks.h (9134 => 9135)
--- trunk/include/linux/usb/quirks.h 2010-09-10 18:27:52 UTC (rev 9134)
+++ trunk/include/linux/usb/quirks.h 2010-09-13 17:50:37 UTC (rev 9135)
@@ -22,8 +22,4 @@
/*device will morph if reset, don't use reset for handling errors */
#define USB_QUIRK_RESET_MORPHS 0x00000010
-/* device needs a pause during initialization, after we read the device
- descriptor */
-#define USB_QUIRK_DELAY_INIT 0x00000040
-
#endif /* __LINUX_USB_QUIRKS_H */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
