diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 20:14:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 20:14:01 -0500 |
| commit | db30c70575822cc84d87b5613c19cac24734b99f (patch) | |
| tree | 82945ad5813bfe6633698233981d270b5f0a310b /drivers/input/serio/serio.c | |
| parent | c861ea2cb2c25c1698734d9b0540a09e253690a1 (diff) | |
| parent | 9334e90d5ac5ee1fa6d8b75acb7c64a8907787d1 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (29 commits)
Input: i8042 - add Dell Vostro 1510 to nomux list
Input: gtco - use USB endpoint API
Input: add support for Maple controller as a joystick
Input: atkbd - broaden the Dell DMI signatures
Input: HIL drivers - add MODULE_ALIAS()
Input: map_to_7segment.h - convert to __inline__ for userspace
Input: add support for enhanced rotary controller on pxa930 and pxa935
Input: add support for trackball on pxa930 and pxa935
Input: add da9034 touchscreen support
Input: ads7846 - strict_strtoul takes unsigned long
Input: make some variables and functions static
Input: add tsc2007 based touchscreen driver
Input: psmouse - add module parameters to control OLPC touchpad delays
Input: i8042 - add Gigabyte M912 netbook to noloop exception table
Input: atkbd - Samsung NC10 key repeat fix
Input: atkbd - add keyboard quirk for HP Pavilion ZV6100 laptop
Input: libps2 - handle 0xfc responses from devices
Input: add support for Wacom W8001 penabled serial touchscreen
Input: synaptics - report multi-taps only if supported by the device
Input: add joystick driver for Walkera WK-0701 RC transmitter
...
Diffstat (limited to 'drivers/input/serio/serio.c')
| -rw-r--r-- | drivers/input/serio/serio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 2f12d60eee3..bc033250dfc 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c | |||
| @@ -546,8 +546,8 @@ static void serio_init_port(struct serio *serio) | |||
| 546 | spin_lock_init(&serio->lock); | 546 | spin_lock_init(&serio->lock); |
| 547 | mutex_init(&serio->drv_mutex); | 547 | mutex_init(&serio->drv_mutex); |
| 548 | device_initialize(&serio->dev); | 548 | device_initialize(&serio->dev); |
| 549 | snprintf(serio->dev.bus_id, sizeof(serio->dev.bus_id), | 549 | dev_set_name(&serio->dev, "serio%ld", |
| 550 | "serio%ld", (long)atomic_inc_return(&serio_no) - 1); | 550 | (long)atomic_inc_return(&serio_no) - 1); |
| 551 | serio->dev.bus = &serio_bus; | 551 | serio->dev.bus = &serio_bus; |
| 552 | serio->dev.release = serio_release_port; | 552 | serio->dev.release = serio_release_port; |
| 553 | if (serio->parent) { | 553 | if (serio->parent) { |