Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] USB: MODALIAS change for bcdDevice

Browse source 
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: Roman Kagan <rkagan@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roman Kagan 2005-04-22 15:07:01 -07:00 committed by Greg KH
parent b19dcd9341
commit fb3b4ebc0b
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/core/usb.c
View file

@ -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, if (add_hotplug_env_var(envp, num_envp, &i,
buffer, buffer_size, &length, 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.idVendor),
le16_to_cpu(usb_dev->descriptor.idProduct), le16_to_cpu(usb_dev->descriptor.idProduct),
le16_to_cpu(usb_dev->descriptor.bcdDevice), le16_to_cpu(usb_dev->descriptor.bcdDevice),
le16_to_cpu(usb_dev->descriptor.bcdDevice),
usb_dev->descriptor.bDeviceClass, usb_dev->descriptor.bDeviceClass,
usb_dev->descriptor.bDeviceSubClass, usb_dev->descriptor.bDeviceSubClass,
usb_dev->descriptor.bDeviceProtocol, usb_dev->descriptor.bDeviceProtocol,
@ -626,11 +625,10 @@ static int usb_hotplug (struct device *dev, char **envp, int num_envp,
} else { } else {
if (add_hotplug_env_var(envp, num_envp, &i, if (add_hotplug_env_var(envp, num_envp, &i,
buffer, buffer_size, &length, 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.idVendor),
le16_to_cpu(usb_dev->descriptor.idProduct), le16_to_cpu(usb_dev->descriptor.idProduct),
le16_to_cpu(usb_dev->descriptor.bcdDevice), le16_to_cpu(usb_dev->descriptor.bcdDevice),
le16_to_cpu(usb_dev->descriptor.bcdDevice),
usb_dev->descriptor.bDeviceClass, usb_dev->descriptor.bDeviceClass,
usb_dev->descriptor.bDeviceSubClass, usb_dev->descriptor.bDeviceSubClass,
usb_dev->descriptor.bDeviceProtocol)) usb_dev->descriptor.bDeviceProtocol))