diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 16:03:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 16:03:09 -0800 |
| commit | bb0851ff9dc65dd9c9365fdb87895d98235ac463 (patch) | |
| tree | d19b7440bb5b0dec31cef2c384cccdd473f314e7 /drivers/usb/core/sysfs.c | |
| parent | 34f2c1c35ff014a5d145971e41caa940cd62d563 (diff) | |
| parent | 5f629ad7e5f9b99c6d025bf199d402734bd72d0f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (25 commits)
USB: s3c2410 gadget: ensure vbus pin in input mode during read
USB: s3c2410 gadget: allow sharing of vbus irq
USB: s3c2410 gadget: Header move fixups
USB: usb-storage: unusual_devs entry for JetFlash TS1GJF2A
USB: fix up EHCI startup synchronization
USB: make the microtek driver and HAL cooperate
USB: uevent environment key fix
USB: keep track of whether interface sysfs files exist
USB: sierra: new product id
USB HCD: avoid duplicate local_irq_disable()
USB: mailing lists have changed
USB: remove USB HUB entry from MAINTAINERS
USB: fix directory references in usb/README
USB: add support for an older firmware revision for the Nikon D200
USB: FIx locks and urb->status in adutux (updated)
USB: power-management documenation update
USB: Fix signr comment in usbdevice_fs.h
usbserial: fix inconsistent lock state
USB: fix usbled disconnect read race #2
USB: free memory when writing fails in usb/serial/mos7840.c
...
Diffstat (limited to 'drivers/usb/core/sysfs.c')
| -rw-r--r-- | drivers/usb/core/sysfs.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index b04afd06e502..32bd130b1eed 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c @@ -735,6 +735,8 @@ int usb_create_sysfs_intf_files(struct usb_interface *intf) struct usb_host_interface *alt = intf->cur_altsetting; int retval; + if (intf->sysfs_files_created) + return 0; retval = sysfs_create_group(&dev->kobj, &intf_attr_grp); if (retval) return retval; @@ -746,6 +748,7 @@ int usb_create_sysfs_intf_files(struct usb_interface *intf) if (intf->intf_assoc) retval = sysfs_create_group(&dev->kobj, &intf_assoc_attr_grp); usb_create_intf_ep_files(intf, udev); + intf->sysfs_files_created = 1; return 0; } @@ -753,8 +756,11 @@ void usb_remove_sysfs_intf_files(struct usb_interface *intf) { struct device *dev = &intf->dev; + if (!intf->sysfs_files_created) + return; usb_remove_intf_ep_files(intf); device_remove_file(dev, &dev_attr_interface); sysfs_remove_group(&dev->kobj, &intf_attr_grp); sysfs_remove_group(&intf->dev.kobj, &intf_assoc_attr_grp); + intf->sysfs_files_created = 0; } |