Commit fb3b4ebc authored by Roman Kagan's avatar Roman Kagan Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: MODALIAS change for bcdDevice 



The patch below adjusts the MODALIAS generated by the usb hotplug
function to match the proposed change to scripts/mod/file2alias.c.

Signed-off-by: default avatarRoman Kagan <rkagan@mail.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b19dcd93

drivers/usb/core/usb.c

+2 −4
Original line number Diff line number Diff line
@@ -611,11 +611,10 @@ static int usb_hotplug (struct device *dev, char **envp, int num_envp, 


		if (add_hotplug_env_var(envp, num_envp, &i,

					buffer, buffer_size, &length,

					"MODALIAS=usb:v%04Xp%04Xdl%04Xdh%04Xdc%02Xdsc%02Xdp%02Xic%02Xisc%02Xip%02X",

					"MODALIAS=usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic%02Xisc%02Xip%02X",

					le16_to_cpu(usb_dev->descriptor.idVendor),

					le16_to_cpu(usb_dev->descriptor.idProduct),

					le16_to_cpu(usb_dev->descriptor.bcdDevice),

					le16_to_cpu(usb_dev->descriptor.bcdDevice),

					usb_dev->descriptor.bDeviceClass,

					usb_dev->descriptor.bDeviceSubClass,

					usb_dev->descriptor.bDeviceProtocol,
@@ -626,11 +625,10 @@ static int usb_hotplug (struct device *dev, char **envp, int num_envp, 
 	} else {

		if (add_hotplug_env_var(envp, num_envp, &i,

					buffer, buffer_size, &length,

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

					"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),

					le16_to_cpu(usb_dev->descriptor.bcdDevice),

					usb_dev->descriptor.bDeviceClass,

					usb_dev->descriptor.bDeviceSubClass,

					usb_dev->descriptor.bDeviceProtocol))