Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104203
b: refs/heads/master
c: 8195612
h: refs/heads/master
i:
  104201: 60e792b
  104199: a77e3d1
v: v3
  • Loading branch information
Dmitry Torokhov committed Jun 30, 2008
1 parent 97bdc61 commit 6d70c0e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c98122828111d3eeb29bd2d51496e300b4e5356e
refs/heads/master: 819561286b8eca845ce741141a016de2b51e90c7
10 changes: 7 additions & 3 deletions trunk/drivers/input/evbug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;

Expand All @@ -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);
Expand Down

0 comments on commit 6d70c0e

Please sign in to comment.