From 6d70c0e9c8b02951ceff78e6a73dafb52100ba14 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 2 Jun 2008 01:02:52 -0400 Subject: [PATCH] --- yaml --- r: 104203 b: refs/heads/master c: 819561286b8eca845ce741141a016de2b51e90c7 h: refs/heads/master i: 104201: 60e792b9734ef6fa66cead650b6212ea6705f08c 104199: a77e3d1a8d278989e854369ed352727d12c8fdf2 v: v3 --- [refs] | 2 +- trunk/drivers/input/evbug.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5ef3e1c9e6e7..f8943b438e30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c98122828111d3eeb29bd2d51496e300b4e5356e +refs/heads/master: 819561286b8eca845ce741141a016de2b51e90c7 diff --git a/trunk/drivers/input/evbug.c b/trunk/drivers/input/evbug.c index 67754c776d88..0353601ac3b5 100644 --- a/trunk/drivers/input/evbug.c +++ b/trunk/drivers/input/evbug.c @@ -39,7 +39,7 @@ MODULE_LICENSE("GPL"); static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value) { printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n", - handle->dev->phys, type, code, value); + handle->dev->dev.bus_id, type, code, value); } static int evbug_connect(struct input_handler *handler, struct input_dev *dev, @@ -64,7 +64,10 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev, if (error) goto err_unregister_handle; - printk(KERN_DEBUG "evbug.c: Connected device: \"%s\", %s\n", dev->name, dev->phys); + printk(KERN_DEBUG "evbug.c: Connected device: %s (%s at %s)\n", + dev->dev.bus_id, + dev->name ?: "unknown", + dev->phys ?: "unknown"); return 0; @@ -77,7 +80,8 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev, static void evbug_disconnect(struct input_handle *handle) { - printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n", handle->dev->phys); + printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n", + handle->dev->dev.bus_id); input_close_device(handle); input_unregister_handle(handle);