Commit 7521803d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] USB: always export interface information for modalias 



This fixes a problem with some cdc acm devices that were not getting
automatically loaded as the module alias was not being reported
properly.

This check was for back in the days when we only reported hotplug events
for the main usb device, not the interfaces.  We should always give the
interface information for MODALIAS/modalias as it can be needed.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 17a882fc

drivers/usb/core/sysfs.c

+14 −21
Original line number Diff line number Diff line
@@ -462,30 +462,23 @@ static ssize_t show_modalias(struct device *dev, struct device_attribute *attr, 
{

	struct usb_interface *intf;

	struct usb_device *udev;

	int len;

	struct usb_host_interface *alt;



	intf = to_usb_interface(dev);

	udev = interface_to_usbdev(intf);

	alt = intf->cur_altsetting;



	len = sprintf(buf, "usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic",

	return sprintf(buf, "usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02X"

			"ic%02Xisc%02Xip%02X\n",

			le16_to_cpu(udev->descriptor.idVendor),

			le16_to_cpu(udev->descriptor.idProduct),

			le16_to_cpu(udev->descriptor.bcdDevice),

			udev->descriptor.bDeviceClass,

			udev->descriptor.bDeviceSubClass,

			       udev->descriptor.bDeviceProtocol);

	buf += len;



	if (udev->descriptor.bDeviceClass == 0) {

		struct usb_host_interface *alt = intf->cur_altsetting;



		return len + sprintf(buf, "%02Xisc%02Xip%02X\n",

			udev->descriptor.bDeviceProtocol,

			alt->desc.bInterfaceClass,

			alt->desc.bInterfaceSubClass,

			alt->desc.bInterfaceProtocol);

 	} else {

		return len + sprintf(buf, "*isc*ip*\n");

	}

}

static DEVICE_ATTR(modalias, S_IRUGO, show_modalias, NULL);

drivers/usb/core/usb.c

+23 −40
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ static int usb_hotplug (struct device *dev, char **envp, int num_envp, 
{

	struct usb_interface *intf;

	struct usb_device *usb_dev;

	struct usb_host_interface *alt;

	int i = 0;

	int length = 0;
@@ -585,6 +586,7 @@ static int usb_hotplug (struct device *dev, char **envp, int num_envp, 


	intf = to_usb_interface(dev);

	usb_dev = interface_to_usbdev (intf);

	alt = intf->cur_altsetting;



	if (usb_dev->devnum < 0) {

		pr_debug ("usb %s: already deleted?\n", dev->bus_id);
@@ -627,13 +629,6 @@ static int usb_hotplug (struct device *dev, char **envp, int num_envp, 
				usb_dev->descriptor.bDeviceProtocol))

		return -ENOMEM;



	if (usb_dev->descriptor.bDeviceClass == 0) {

		struct usb_host_interface *alt = intf->cur_altsetting;



		/* 2.4 only exposed interface zero.  in 2.5, hotplug

		 * agents are called for all interfaces, and can use

		 * $DEVPATH/bInterfaceNumber if necessary.

		 */

	if (add_hotplug_env_var(envp, num_envp, &i,

				buffer, buffer_size, &length,

				"INTERFACE=%d/%d/%d",
@@ -655,18 +650,6 @@ static int usb_hotplug (struct device *dev, char **envp, int num_envp, 
				alt->desc.bInterfaceSubClass,

				alt->desc.bInterfaceProtocol))

		return -ENOMEM;

 	} else {

		if (add_hotplug_env_var(envp, num_envp, &i,

					buffer, buffer_size, &length,

					"MODALIAS=usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic*isc*ip*",

					le16_to_cpu(usb_dev->descriptor.idVendor),

					le16_to_cpu(usb_dev->descriptor.idProduct),

					le16_to_cpu(usb_dev->descriptor.bcdDevice),

					usb_dev->descriptor.bDeviceClass,

					usb_dev->descriptor.bDeviceSubClass,

					usb_dev->descriptor.bDeviceProtocol))

			return -ENOMEM;

	}



	envp[i] = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE