diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-14 10:43:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-14 10:43:36 -0800 |
| commit | 76ae37da2143028f79a854379960532066df09f8 (patch) | |
| tree | dd22384b21ce76be90d0ff06acd3a15c258aa12b | |
| parent | be3a4f9c213ed54aa7760b2a4dbc8886f8cf9bf3 (diff) | |
| download | patches-76ae37da2143028f79a854379960532066df09f8.tar.gz | |
usb fix
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | usb.current/usb-add-speed-values-for-usb-3.0-and-wireless-controllers.patch | 34 | ||||
| -rw-r--r-- | usb/usb-export-usb_quirk_reset_morphs-through-sysfs.patch | 4 |
3 files changed, 37 insertions, 2 deletions
@@ -27,6 +27,7 @@ usb.current/usb-don-t-use-gfp_kernel-while-we-cannot-reset-a-storage-device.patc usb.current/usb-ehci-fix-handling-of-unusual-interrupt-intervals.patch usb.current/usb-ehci-uhci-fix-race-between-root-hub-suspend-and-port-resume.patch usb.current/usb-add-missing-delay-during-remote-wakeup.patch +usb.current/usb-add-speed-values-for-usb-3.0-and-wireless-controllers.patch ################################# # Staging patches for 2.6.33 diff --git a/usb.current/usb-add-speed-values-for-usb-3.0-and-wireless-controllers.patch b/usb.current/usb-add-speed-values-for-usb-3.0-and-wireless-controllers.patch new file mode 100644 index 00000000000000..60f86c231b0ea1 --- /dev/null +++ b/usb.current/usb-add-speed-values-for-usb-3.0-and-wireless-controllers.patch @@ -0,0 +1,34 @@ +From foo@baz Thu Jan 14 10:33:19 PST 2010 +Date: Thu, 14 Jan 2010 10:33:19 -0800 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: USB: add speed values for USB 3.0 and wireless controllers + +These controllers say "unknown" for their speed in sysfs, which +obviously isn't correct. + +Reported-by: Kurt Garloff <garloff@novell.com> +Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Cc: David Vrabel <david.vrabel@csr.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/core/sysfs.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/usb/core/sysfs.c ++++ b/drivers/usb/core/sysfs.c +@@ -115,6 +115,12 @@ show_speed(struct device *dev, struct de + case USB_SPEED_HIGH: + speed = "480"; + break; ++ case USB_SPEED_VARIABLE: ++ speed = "480"; ++ break; ++ case USB_SPEED_SUPER: ++ speed = "5000"; ++ break; + default: + speed = "unknown"; + } diff --git a/usb/usb-export-usb_quirk_reset_morphs-through-sysfs.patch b/usb/usb-export-usb_quirk_reset_morphs-through-sysfs.patch index ae9ef92afb66f1..bc79b4e63d708f 100644 --- a/usb/usb-export-usb_quirk_reset_morphs-through-sysfs.patch +++ b/usb/usb-export-usb_quirk_reset_morphs-through-sysfs.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c -@@ -185,6 +185,36 @@ show_quirks(struct device *dev, struct d +@@ -191,6 +191,36 @@ show_quirks(struct device *dev, struct d static DEVICE_ATTR(quirks, S_IRUGO, show_quirks, NULL); static ssize_t @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> show_urbnum(struct device *dev, struct device_attribute *attr, char *buf) { struct usb_device *udev; -@@ -552,6 +582,7 @@ static struct attribute *dev_attrs[] = { +@@ -558,6 +588,7 @@ static struct attribute *dev_attrs[] = { &dev_attr_version.attr, &dev_attr_maxchild.attr, &dev_attr_quirks.attr, |