From 30a8d387d51c7519c8a3bed6212af2f269c355b3 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 4 Apr 2008 23:46:59 -0400 Subject: [PATCH] --- yaml --- r: 93345 b: refs/heads/master c: 61a5c657892a43653d6189972159590751a0673e h: refs/heads/master i: 93343: 77c75e70f8054daacec19f7d24c2b48e079d0aaa v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/message.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5730dcc0fa44..7823c05a2b8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96e12fced365262e185a8e935db23973337b8a2a +refs/heads/master: 61a5c657892a43653d6189972159590751a0673e diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c index a3695b5115ff..5b23f6b017d7 100644 --- a/trunk/drivers/usb/core/message.c +++ b/trunk/drivers/usb/core/message.c @@ -1089,8 +1089,8 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) 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 *dev, int interface, int alternate) */ /* 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_device *dev) 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.