diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-20 14:19:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-20 14:19:25 -0700 |
| commit | 4ae8d6206367af5f28595763af3c54eb711d5782 (patch) | |
| tree | 30ea6fbb681a1c6e6f562d09a923164b2429a4bd /usb | |
| parent | 7a24a1d05e6a8485649db8340eb5bb049e4dde02 (diff) | |
| download | patches-4ae8d6206367af5f28595763af3c54eb711d5782.tar.gz | |
fix up a bug in the endpoint sysfs symlinks
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-endpoint-mess.patch | 10 | ||||
| -rw-r--r-- | usb/usb-serial-dynamic-id.patch | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/usb/usb-endpoint-mess.patch b/usb/usb-endpoint-mess.patch index 7cba47cc4e39c..178b118546918 100644 --- a/usb/usb-endpoint-mess.patch +++ b/usb/usb-endpoint-mess.patch @@ -11,9 +11,9 @@ easier manner than the current usbfs provides us. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/usb/core/endpoint.c | 238 +++++++++++++++++++++++++++----------------- + drivers/usb/core/endpoint.c | 242 +++++++++++++++++++++++++++----------------- include/linux/usb.h | 4 - 2 files changed, 151 insertions(+), 91 deletions(-) + 2 files changed, 155 insertions(+), 91 deletions(-) --- gregkh-2.6.orig/drivers/usb/core/endpoint.c +++ gregkh-2.6/drivers/usb/core/endpoint.c @@ -145,7 +145,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (interval % 1000) unit = 'u'; else { -@@ -119,95 +118,154 @@ static ssize_t show_ep_interval(struct u +@@ -119,95 +118,158 @@ static ssize_t show_ep_interval(struct u return sprintf(buf, "%d%cs\n", interval, unit); } @@ -346,6 +346,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - kobject_put(endpoint->kobj); - endpoint->kobj = NULL; + if (endpoint->ep_dev) { ++ char name[8]; ++ ++ sprintf(name, "ep_%02x", endpoint->desc.bEndpointAddress); ++ sysfs_remove_link(&endpoint->ep_dev->dev.parent->kobj, name); + sysfs_remove_group(&endpoint->ep_dev->dev.kobj, &ep_dev_attr_grp); + device_unregister(&endpoint->ep_dev->dev); + endpoint->ep_dev = NULL; diff --git a/usb/usb-serial-dynamic-id.patch b/usb/usb-serial-dynamic-id.patch index fa7a146342bf3..ef507d3430163 100644 --- a/usb/usb-serial-dynamic-id.patch +++ b/usb/usb-serial-dynamic-id.patch @@ -284,7 +284,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/include/linux/usb.h +++ gregkh-2.6/include/linux/usb.h -@@ -421,6 +421,8 @@ extern void usb_driver_release_interface +@@ -422,6 +422,8 @@ extern void usb_driver_release_interface struct usb_interface *iface); const struct usb_device_id *usb_match_id(struct usb_interface *interface, const struct usb_device_id *id); @@ -293,7 +293,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> extern struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor); -@@ -535,11 +537,21 @@ static inline int usb_make_path (struct +@@ -536,11 +538,21 @@ static inline int usb_make_path (struct /* ----------------------------------------------------------------------- */ @@ -315,7 +315,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /** * struct usb_driver - identifies USB driver to usbcore * @name: The driver name should be unique among USB drivers, -@@ -1203,6 +1215,7 @@ usb_maxpacket(struct usb_device *udev, i +@@ -1204,6 +1216,7 @@ usb_maxpacket(struct usb_device *udev, i extern void usb_register_notify(struct notifier_block *nb); extern void usb_unregister_notify(struct notifier_block *nb); |