From 5c6c102a9b669b539185f2ca0ad2c4136f5bd78d Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Thu, 15 Sep 2005 02:01:54 -0500 Subject: [PATCH] --- yaml --- r: 10567 b: refs/heads/master c: 051b2feaa4a92592d160dcb8715cc4a5faaaa52f h: refs/heads/master i: 10565: 54c1e8672fe2b0a750dba2b497037a060960787e 10563: 7eacca1d98ab5fc2555d4274795811dbec887b6e 10559: c6d9cf8e0fdf01e3a4faa9d04fbd8fe26ec594a9 v: v3 --- [refs] | 2 +- trunk/drivers/input/input.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c4f50b715e4d..48596793b027 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ebdcbc2fc4f192c5e685565c9c853a9e01a5eeb +refs/heads/master: 051b2feaa4a92592d160dcb8715cc4a5faaaa52f diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c index 0e2e890c0988..ceaed631d49f 100644 --- a/trunk/drivers/input/input.c +++ b/trunk/drivers/input/input.c @@ -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)