diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-15 09:57:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-15 09:57:56 -0700 |
| commit | de2bbd73d3158217114840b9c31e58c328f0d32d (patch) | |
| tree | 7377ef5c4a0bbb756b3c1f1572e7edce547952a4 /usb | |
| parent | 79054bca4f34ac6630d91a2282b1b3bc500eb963 (diff) | |
| download | patches-de2bbd73d3158217114840b9c31e58c328f0d32d.tar.gz | |
add driver printk patch and reorder a few others
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-endpoint-mess.patch | 4 | ||||
| -rw-r--r-- | usb/usb-serial-dynamic-id.patch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usb/usb-endpoint-mess.patch b/usb/usb-endpoint-mess.patch index 72f3be475f43b..7cba47cc4e39c 100644 --- a/usb/usb-endpoint-mess.patch +++ b/usb/usb-endpoint-mess.patch @@ -239,7 +239,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { - struct ep_object *ep_obj = to_ep_object(kobj); - struct ep_attribute *ep_attr = to_ep_attribute(attr); -+ /* Ok, we cheat as we know we only have on ep_class */ ++ /* Ok, we cheat as we know we only have one ep_class */ + class_destroy(ep_class->class); + kfree(ep_class); + ep_class = NULL; @@ -335,7 +335,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + return; +error: + kfree(ep_dev); -+ goto exit; ++ return; } void usb_remove_ep_files(struct usb_host_endpoint *endpoint) diff --git a/usb/usb-serial-dynamic-id.patch b/usb/usb-serial-dynamic-id.patch index 64abcdb9f292f..fa7a146342bf3 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 -@@ -419,6 +419,8 @@ extern void usb_driver_release_interface +@@ -421,6 +421,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); -@@ -533,11 +535,21 @@ static inline int usb_make_path (struct +@@ -535,11 +537,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, -@@ -1201,6 +1213,7 @@ usb_maxpacket(struct usb_device *udev, i +@@ -1203,6 +1215,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); |