aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-11-30 14:54:20 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-11-30 14:54:20 -0800
commit09785355a29fc1316655725a3c4a2638e44330b6 (patch)
treec6a8c76e3ef485d63d92c797bdb05f4b9542573d /usb
parentb88a5d79af4ecc5c3f4667548c98dcc059c0edab (diff)
downloadpatches-09785355a29fc1316655725a3c4a2638e44330b6.tar.gz
more bugfixes
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-add-devpath-sysfs-attribute.patch52
-rw-r--r--usb/usb-add-ehci-support-for-mx27-and-mx31-based-boards.patch2
-rw-r--r--usb/usb-add-support-for-xilinx-usb-host-controller.patch2
-rw-r--r--usb/usb-ehci-add-native-scatter-gather-support.patch2
-rw-r--r--usb/usb-ehci-minor-constant-fix-for-schedule_slop.patch8
-rw-r--r--usb/usb-ehci-respect-ist-when-scheduling-new-split-itds.patch8
-rw-r--r--usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch2
-rw-r--r--usb/usb-option.c-add-support-for-d-link-dwm-162-u5.patch2
-rw-r--r--usb/usb-remove-the-auto_pm-flag.patch2
9 files changed, 66 insertions, 14 deletions
diff --git a/usb/usb-add-devpath-sysfs-attribute.patch b/usb/usb-add-devpath-sysfs-attribute.patch
new file mode 100644
index 00000000000000..f6fdfb032fd7ee
--- /dev/null
+++ b/usb/usb-add-devpath-sysfs-attribute.patch
@@ -0,0 +1,52 @@
+From foo@baz Mon Nov 30 11:15:02 PST 2009
+Date: Mon, 30 Nov 2009 11:15:02 -0800
+To: Greg KH <greg@kroah.com>
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: USB: add devpath sysfs attribute
+
+This is not exported from the usb core, yet we rely on it to create
+paths to interfaces for this device in sysfs. Export it to make
+userspace tools have an easier time to figure things out.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/usb/core/sysfs.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/core/sysfs.c
++++ b/drivers/usb/core/sysfs.c
+@@ -139,6 +139,16 @@ show_devnum(struct device *dev, struct d
+ static DEVICE_ATTR(devnum, S_IRUGO, show_devnum, NULL);
+
+ static ssize_t
++show_devpath(struct device *dev, struct device_attribute *attr, char *buf)
++{
++ struct usb_device *udev;
++
++ udev = to_usb_device(dev);
++ return sprintf(buf, "%s\n", udev->devpath);
++}
++static DEVICE_ATTR(devpath, S_IRUGO, show_devpath, NULL);
++
++static ssize_t
+ show_version(struct device *dev, struct device_attribute *attr, char *buf)
+ {
+ struct usb_device *udev;
+@@ -538,8 +548,8 @@ static struct attribute *dev_attrs[] = {
+ &dev_attr_bConfigurationValue.attr,
+ &dev_attr_bmAttributes.attr,
+ &dev_attr_bMaxPower.attr,
+- &dev_attr_urbnum.attr,
+ /* device attributes */
++ &dev_attr_urbnum.attr,
+ &dev_attr_idVendor.attr,
+ &dev_attr_idProduct.attr,
+ &dev_attr_bcdDevice.attr,
+@@ -551,6 +561,7 @@ static struct attribute *dev_attrs[] = {
+ &dev_attr_speed.attr,
+ &dev_attr_busnum.attr,
+ &dev_attr_devnum.attr,
++ &dev_attr_devpath.attr,
+ &dev_attr_version.attr,
+ &dev_attr_maxchild.attr,
+ &dev_attr_quirks.attr,
diff --git a/usb/usb-add-ehci-support-for-mx27-and-mx31-based-boards.patch b/usb/usb-add-ehci-support-for-mx27-and-mx31-based-boards.patch
index 9745ed3d8db249..50b4e648bb7327 100644
--- a/usb/usb-add-ehci-support-for-mx27-and-mx31-based-boards.patch
+++ b/usb/usb-add-ehci-support-for-mx27-and-mx31-based-boards.patch
@@ -181,7 +181,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1103,6 +1103,11 @@ MODULE_LICENSE ("GPL");
+@@ -1105,6 +1105,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_fsl_driver
#endif
diff --git a/usb/usb-add-support-for-xilinx-usb-host-controller.patch b/usb/usb-add-support-for-xilinx-usb-host-controller.patch
index 4a4e8b920058b2..5136612653feb4 100644
--- a/usb/usb-add-support-for-xilinx-usb-host-controller.patch
+++ b/usb/usb-add-support-for-xilinx-usb-host-controller.patch
@@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1118,6 +1118,11 @@ MODULE_LICENSE ("GPL");
+@@ -1120,6 +1120,11 @@ MODULE_LICENSE ("GPL");
#define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_driver
#endif
diff --git a/usb/usb-ehci-add-native-scatter-gather-support.patch b/usb/usb-ehci-add-native-scatter-gather-support.patch
index 007805325d641f..d6d77590f7ab59 100644
--- a/usb/usb-ehci-add-native-scatter-gather-support.patch
+++ b/usb/usb-ehci-add-native-scatter-gather-support.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -604,6 +604,8 @@ static int ehci_init(struct usb_hcd *hcd
+@@ -605,6 +605,8 @@ static int ehci_init(struct usb_hcd *hcd
}
ehci->command = temp;
diff --git a/usb/usb-ehci-minor-constant-fix-for-schedule_slop.patch b/usb/usb-ehci-minor-constant-fix-for-schedule_slop.patch
index 6f0e32ef6a1d24..d8979907921a99 100644
--- a/usb/usb-ehci-minor-constant-fix-for-schedule_slop.patch
+++ b/usb/usb-ehci-minor-constant-fix-for-schedule_slop.patch
@@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
-@@ -1373,7 +1373,7 @@ sitd_slot_ok (
+@@ -1385,7 +1385,7 @@ sitd_slot_ok (
* given EHCI_TUNE_FLS and the slop). Or, write a smarter scheduler!
*/
@@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int
iso_stream_schedule (
-@@ -1387,7 +1387,7 @@ iso_stream_schedule (
+@@ -1399,7 +1399,7 @@ iso_stream_schedule (
unsigned mod = ehci->periodic_size << 3;
struct ehci_iso_sched *sched = urb->hcpriv;
@@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
ehci_dbg (ehci, "iso request %p too long\n", urb);
status = -EFBIG;
goto fail;
-@@ -1420,7 +1420,7 @@ iso_stream_schedule (
+@@ -1432,7 +1432,7 @@ iso_stream_schedule (
start += mod;
/* Fell behind (by up to twice the slop amount)? */
@@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
start += period * DIV_ROUND_UP(
max - start, period) - mod;
-@@ -1439,7 +1439,7 @@ iso_stream_schedule (
+@@ -1451,7 +1451,7 @@ iso_stream_schedule (
* can also help high bandwidth if the dma and irq loads don't
* jump until after the queue is primed.
*/
diff --git a/usb/usb-ehci-respect-ist-when-scheduling-new-split-itds.patch b/usb/usb-ehci-respect-ist-when-scheduling-new-split-itds.patch
index 3f0a7819981cf0..3e67179fa40dc2 100644
--- a/usb/usb-ehci-respect-ist-when-scheduling-new-split-itds.patch
+++ b/usb/usb-ehci-respect-ist-when-scheduling-new-split-itds.patch
@@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -548,7 +548,7 @@ static int ehci_init(struct usb_hcd *hcd
+@@ -549,7 +549,7 @@ static int ehci_init(struct usb_hcd *hcd
/* controllers may cache some of the periodic schedule ... */
hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
if (HCC_ISOC_CACHE(hcc_params)) // full frame cache
@@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
-@@ -1382,10 +1382,11 @@ iso_stream_schedule (
+@@ -1394,10 +1394,11 @@ iso_stream_schedule (
struct ehci_iso_stream *stream
)
{
@@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (sched->span > (mod - SCHEDULE_SLOP)) {
ehci_dbg (ehci, "iso request %p too long\n", urb);
-@@ -1406,26 +1407,35 @@ iso_stream_schedule (
+@@ -1418,26 +1419,35 @@ iso_stream_schedule (
now = ehci_readl(ehci, &ehci->regs->frame_index) % mod;
@@ -125,7 +125,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
status = -EFBIG;
goto fail;
}
-@@ -1470,7 +1480,7 @@ iso_stream_schedule (
+@@ -1482,7 +1492,7 @@ iso_stream_schedule (
/* no room in the schedule */
ehci_dbg (ehci, "iso %ssched full %p (now %d max %d)\n",
list_empty (&stream->td_list) ? "" : "re",
diff --git a/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch b/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch
index d8ac4ccc24891b..a5e520a4f26a88 100644
--- a/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch
+++ b/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1108,6 +1108,11 @@ MODULE_LICENSE ("GPL");
+@@ -1110,6 +1110,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_hcd_au1xxx_driver
#endif
diff --git a/usb/usb-option.c-add-support-for-d-link-dwm-162-u5.patch b/usb/usb-option.c-add-support-for-d-link-dwm-162-u5.patch
index adfd6fb304a2bf..41ede84d9272f3 100644
--- a/usb/usb-option.c-add-support-for-d-link-dwm-162-u5.patch
+++ b/usb/usb-option.c-add-support-for-d-link-dwm-162-u5.patch
@@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
-@@ -595,6 +595,7 @@ static struct usb_device_id option_ids[]
+@@ -599,6 +599,7 @@ static struct usb_device_id option_ids[]
{ USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_G450) },
{ USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */
{ USB_DEVICE(ALINK_VENDOR_ID, 0x9000) },
diff --git a/usb/usb-remove-the-auto_pm-flag.patch b/usb/usb-remove-the-auto_pm-flag.patch
index 61aa1da70b1964..86a2c844f9e430 100644
--- a/usb/usb-remove-the-auto_pm-flag.patch
+++ b/usb/usb-remove-the-auto_pm-flag.patch
@@ -148,7 +148,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
usb_pm_unlock(udev);
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
-@@ -1308,7 +1308,7 @@ static int option_suspend(struct usb_ser
+@@ -1313,7 +1313,7 @@ static int option_suspend(struct usb_ser
dbg("%s entered", __func__);
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:20:10 +0000