diff options
| author |   Axel Lin <axel.lin@gmail.com> | 2010-11-21 22:27:13 -0800 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-11-21 22:32:17 -0800 |
| commit | f09830ab15bfb7eb4e832e44189b5b5883309811 (patch) | |
| tree | 7ca36efaf3b50fcd1eeaf9d5a0c071c2d29c8df3 /drivers/input/serio | |
| parent | Input: ams_delta_serio - fix wrong kfree in ams_delta_serio_exit (diff) | |
| download | linux-dev-f09830ab15bfb7eb4e832e44189b5b5883309811.tar.xz linux-dev-f09830ab15bfb7eb4e832e44189b5b5883309811.zip | |
Input: ct82c710 - remove a redundant serio_register_port()
We already call serio_register_port() in ct82c710_probe(),
thus remove a redundant serio_register_port() in ct82c710_init().
Looks like this bug is introduced by
916d83cfe5da1cda454d8b0ae233f06b58bd7f91
"Input: ct82c710 - convert to the new platform device interface"
[dtor@mail.ru: also move printk to where we register port]
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/ct82c710.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c index 4a3084695c00..448c7724beb9 100644 --- a/drivers/input/serio/ct82c710.c +++ b/drivers/input/serio/ct82c710.c @@ -191,6 +191,9 @@ static int __devinit ct82c710_probe(struct platform_device *dev) serio_register_port(ct82c710_port); + printk(KERN_INFO "serio: C&T 82c710 mouse port at %#llx irq %d\n", + (unsigned long long)CT82C710_DATA, CT82C710_IRQ); + return 0; } @@ -237,11 +240,6 @@ static int __init ct82c710_init(void) if (error) goto err_free_device; - serio_register_port(ct82c710_port); - - printk(KERN_INFO "serio: C&T 82c710 mouse port at %#llx irq %d\n", - (unsigned long long)CT82C710_DATA, CT82C710_IRQ); - return 0; err_free_device: |