From b804c574b401e3347d37a61d9213089ffed53c9d Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Wed, 8 Aug 2007 11:59:18 -0400 Subject: [PATCH] --- yaml --- r: 67831 b: refs/heads/master c: d74d4a69dc1cc7ddc0eabb9c9f1e45005e2984eb h: refs/heads/master i: 67829: e5fce601188708e34c1156724ff2560358f8980f 67827: da9aedffa82857a13043ad25de6c3bca45f112d0 67823: ba3cfbbb346f576d62909e95a4723f044a4ce675 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/message.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8e431e8aeaf4..88686192d9ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9df41c5c5899259541dc928872cad4d07b82076 +refs/heads/master: d74d4a69dc1cc7ddc0eabb9c9f1e45005e2984eb diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c index c905b35d4f85..d638375e22e7 100644 --- a/trunk/drivers/usb/core/message.c +++ b/trunk/drivers/usb/core/message.c @@ -1173,6 +1173,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) struct usb_host_interface *alt; int ret; int manual = 0; + int changed; if (dev->state == USB_STATE_SUSPENDED) return -EHOSTUNREACH; @@ -1212,7 +1213,8 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) */ /* prevent submissions using previous endpoint settings */ - if (device_is_registered(&iface->dev)) + changed = (iface->cur_altsetting != alt); + if (changed && device_is_registered(&iface->dev)) usb_remove_sysfs_intf_files(iface); usb_disable_interface(dev, iface); @@ -1249,7 +1251,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) * (Likewise, EP0 never "halts" on well designed devices.) */ usb_enable_interface(dev, iface); - if (device_is_registered(&iface->dev)) + if (changed && device_is_registered(&iface->dev)) usb_create_sysfs_intf_files(iface); return 0;