The patch titled
usb: fix interface deregistration during unbind operations
has been added to the -mm tree. Its filename is
usb-fix-interface-deregistration-during-unbind-operations.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: usb: fix interface deregistration during unbind operations
From: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Removing an interface's sysfs files before unregistering the interface doesn't
work properly, because usb_unbind_interface() will reinstall altsetting 0 and
thereby create new sysfs files. This patch (as1074) removes the files after
the unregistration is finished. It's not quite as clean, but at least it
works.
Also, there's no need to check if an interface has been registered before
removing its sysfs files. If it hasn't been registered then the files won't
have been created, so usb_remove_sysfs_intf_files() will simply do nothing.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Tested-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/usb/core/message.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff -puN drivers/usb/core/message.c~usb-fix-interface-deregistration-during-unbind-operations drivers/usb/core/message.c
--- a/drivers/usb/core/message.c~usb-fix-interface-deregistration-during-unbind-operations
+++ a/drivers/usb/core/message.c
@@ -1089,8 +1089,8 @@ void usb_disable_device(struct usb_devic
continue;
dev_dbg(&dev->dev, "unregistering interface %s\n",
interface->dev.bus_id);
- usb_remove_sysfs_intf_files(interface);
device_del(&interface->dev);
+ usb_remove_sysfs_intf_files(interface);
}
/* Now that the interfaces are unbound, nobody should
@@ -1231,7 +1231,7 @@ int usb_set_interface(struct usb_device
*/
/* prevent submissions using previous endpoint settings */
- if (iface->cur_altsetting != alt && device_is_registered(&iface->dev))
+ if (iface->cur_altsetting != alt)
usb_remove_sysfs_intf_files(iface);
usb_disable_interface(dev, iface);
@@ -1330,8 +1330,7 @@ int usb_reset_configuration(struct usb_d
struct usb_interface *intf = config->interface[i];
struct usb_host_interface *alt;
- if (device_is_registered(&intf->dev))
- usb_remove_sysfs_intf_files(intf);
+ usb_remove_sysfs_intf_files(intf);
alt = usb_altnum_to_altsetting(intf, 0);
/* No altsetting 0? We'll assume the first altsetting.
_
Patches currently in -mm which might be from stern@xxxxxxxxxxxxxxxxxxx are
origin.patch
pm-remove-destroy_suspended_device.patch
usb-fix-interface-deregistration-during-unbind-operations.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
