]> err.no Git - linux-2.6/commitdiff
[PATCH] Input: show sysfs path in /proc/bus/input/devices
authorDmitry Torokhov <dtor_core@ameritech.net>
Thu, 15 Sep 2005 07:01:54 +0000 (02:01 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 28 Oct 2005 16:52:54 +0000 (09:52 -0700)
Input: show sysfs path in /proc/bus/input/devices

Show that sysfs and phys path are different objects.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/input/input.c

index 0e2e890c0988ce470eaf2c73db913084c1d0ae52..ceaed631d49fff5d49ce2abbe454cfa6255eb6eb 100644 (file)
@@ -475,17 +475,21 @@ static int input_devices_read(char *buf, char **start, off_t pos, int count, int
 {
        struct input_dev *dev;
        struct input_handle *handle;
+       const char *path;
 
        off_t at = 0;
        int i, len, cnt = 0;
 
        list_for_each_entry(dev, &input_dev_list, node) {
 
+               path = dev->dynalloc ? kobject_get_path(&dev->cdev.kobj, GFP_KERNEL) : NULL;
+
                len = sprintf(buf, "I: Bus=%04x Vendor=%04x Product=%04x Version=%04x\n",
                        dev->id.bustype, dev->id.vendor, dev->id.product, dev->id.version);
 
                len += sprintf(buf + len, "N: Name=\"%s\"\n", dev->name ? dev->name : "");
                len += sprintf(buf + len, "P: Phys=%s\n", dev->phys ? dev->phys : "");
+               len += sprintf(buf + len, "S: Sysfs=%s\n", path ? path : "");
                len += sprintf(buf + len, "H: Handlers=");
 
                list_for_each_entry(handle, &dev->h_list, d_node)
@@ -516,6 +520,8 @@ static int input_devices_read(char *buf, char **start, off_t pos, int count, int
                        if (cnt >= count)
                                break;
                }
+
+               kfree(path);
        }
 
        if (&dev->node == &input_dev_list)