diff options
Diffstat (limited to 'drivers/usb/core/sysfs.c')
| -rw-r--r-- | drivers/usb/core/sysfs.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index 6781c369ce2..cf05b97693e 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c | |||
| @@ -842,22 +842,19 @@ const struct attribute_group *usb_interface_groups[] = { | |||
| 842 | NULL | 842 | NULL |
| 843 | }; | 843 | }; |
| 844 | 844 | ||
| 845 | int usb_create_sysfs_intf_files(struct usb_interface *intf) | 845 | void usb_create_sysfs_intf_files(struct usb_interface *intf) |
| 846 | { | 846 | { |
| 847 | struct usb_device *udev = interface_to_usbdev(intf); | 847 | struct usb_device *udev = interface_to_usbdev(intf); |
| 848 | struct usb_host_interface *alt = intf->cur_altsetting; | 848 | struct usb_host_interface *alt = intf->cur_altsetting; |
| 849 | int retval; | ||
| 850 | 849 | ||
| 851 | if (intf->sysfs_files_created || intf->unregistering) | 850 | if (intf->sysfs_files_created || intf->unregistering) |
| 852 | return 0; | 851 | return; |
| 853 | 852 | ||
| 854 | if (alt->string == NULL && | 853 | if (!alt->string && !(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) |
| 855 | !(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) | ||
| 856 | alt->string = usb_cache_string(udev, alt->desc.iInterface); | 854 | alt->string = usb_cache_string(udev, alt->desc.iInterface); |
| 857 | if (alt->string) | 855 | if (alt->string && device_create_file(&intf->dev, &dev_attr_interface)) |
| 858 | retval = device_create_file(&intf->dev, &dev_attr_interface); | 856 | ; /* We don't actually care if the function fails. */ |
| 859 | intf->sysfs_files_created = 1; | 857 | intf->sysfs_files_created = 1; |
| 860 | return 0; | ||
| 861 | } | 858 | } |
| 862 | 859 | ||
| 863 | void usb_remove_sysfs_intf_files(struct usb_interface *intf) | 860 | void usb_remove_sysfs_intf_files(struct usb_interface *intf) |
