Commit b6eb2d84 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

usbcore: add configuration_string to attribute group

This patch (as737b) does a very small cleanup of core/sysfs.c by adding
the configuration_string attribute file to the existing attribute group
instead of treating it separately.  It doesn't need this separate
treatment because unlike the other device string attributes, it changes
along with the active configuration.

The patch also fixes a simple typo (which, oddly enough, doesn't seem to
bother the compiler).
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b94badbb
...@@ -60,7 +60,7 @@ static ssize_t ...@@ -60,7 +60,7 @@ static ssize_t
set_bConfigurationValue (struct device *dev, struct device_attribute *attr, set_bConfigurationValue (struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct usb_device *udev = udev = to_usb_device (dev); struct usb_device *udev = to_usb_device (dev);
int config, value; int config, value;
if (sscanf (buf, "%u", &config) != 1 || config > 255) if (sscanf (buf, "%u", &config) != 1 || config > 255)
...@@ -186,6 +186,7 @@ usb_descriptor_attr (bMaxPacketSize0, "%d\n") ...@@ -186,6 +186,7 @@ usb_descriptor_attr (bMaxPacketSize0, "%d\n")
static struct attribute *dev_attrs[] = { static struct attribute *dev_attrs[] = {
/* current configuration's attributes */ /* current configuration's attributes */
&dev_attr_configuration.attr,
&dev_attr_bNumInterfaces.attr, &dev_attr_bNumInterfaces.attr,
&dev_attr_bConfigurationValue.attr, &dev_attr_bConfigurationValue.attr,
&dev_attr_bmAttributes.attr, &dev_attr_bmAttributes.attr,
...@@ -221,7 +222,6 @@ void usb_create_sysfs_dev_files (struct usb_device *udev) ...@@ -221,7 +222,6 @@ void usb_create_sysfs_dev_files (struct usb_device *udev)
device_create_file (dev, &dev_attr_product); device_create_file (dev, &dev_attr_product);
if (udev->serial) if (udev->serial)
device_create_file (dev, &dev_attr_serial); device_create_file (dev, &dev_attr_serial);
device_create_file (dev, &dev_attr_configuration);
usb_create_ep_files(dev, &udev->ep0, udev); usb_create_ep_files(dev, &udev->ep0, udev);
} }
...@@ -238,7 +238,6 @@ void usb_remove_sysfs_dev_files (struct usb_device *udev) ...@@ -238,7 +238,6 @@ void usb_remove_sysfs_dev_files (struct usb_device *udev)
device_remove_file(dev, &dev_attr_product); device_remove_file(dev, &dev_attr_product);
if (udev->serial) if (udev->serial)
device_remove_file(dev, &dev_attr_serial); device_remove_file(dev, &dev_attr_serial);
device_remove_file (dev, &dev_attr_configuration);
} }
/* Interface fields */ /* Interface fields */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment