From 47641a239580a76bc7fc38526c0df6f797d4a34c Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 21 Aug 2007 13:41:08 +0200 Subject: [PATCH] --- yaml --- r: 64317 b: refs/heads/master c: d65cc1b45e7d3a24c25fd3d730042e407d6d64ce h: refs/heads/master i: 64315: eb7fc2220c01fee024efb1b84223b07564d75406 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/message.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2198d2085e89..29cca49ca5d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83fc8a151beda2d63e196a7ab2e12316c37a1e91 +refs/heads/master: d65cc1b45e7d3a24c25fd3d730042e407d6d64ce diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c index 5498506e9c5e..d8f7b089a8f0 100644 --- a/trunk/drivers/usb/core/message.c +++ b/trunk/drivers/usb/core/message.c @@ -1358,6 +1358,30 @@ static int usb_if_uevent(struct device *dev, char **envp, int num_envp, usb_dev = interface_to_usbdev(intf); alt = intf->cur_altsetting; +#ifdef CONFIG_USB_DEVICEFS + if (add_uevent_var(envp, num_envp, &i, + buffer, buffer_size, &length, + "DEVICE=/proc/bus/usb/%03d/%03d", + usb_dev->bus->busnum, usb_dev->devnum)) + return -ENOMEM; +#endif + + if (add_uevent_var(envp, num_envp, &i, + buffer, buffer_size, &length, + "PRODUCT=%x/%x/%x", + le16_to_cpu(usb_dev->descriptor.idVendor), + le16_to_cpu(usb_dev->descriptor.idProduct), + le16_to_cpu(usb_dev->descriptor.bcdDevice))) + return -ENOMEM; + + if (add_uevent_var(envp, num_envp, &i, + buffer, buffer_size, &length, + "TYPE=%d/%d/%d", + usb_dev->descriptor.bDeviceClass, + usb_dev->descriptor.bDeviceSubClass, + usb_dev->descriptor.bDeviceProtocol)) + return -ENOMEM; + if (add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, "INTERFACE=%d/%d/%d",