summaryrefslogtreecommitdiff
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-11-21 22:27:13 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-11-21 22:32:17 -0800
commitf09830ab15bfb7eb4e832e44189b5b5883309811 (patch)
tree7ca36efaf3b50fcd1eeaf9d5a0c071c2d29c8df3 /drivers/input/serio
parentebcc019926269e7e123d55ec92ff00c2688ca343 (diff)
downloadlinux-3.10-f09830ab15bfb7eb4e832e44189b5b5883309811.tar.gz
linux-3.10-f09830ab15bfb7eb4e832e44189b5b5883309811.tar.bz2
linux-3.10-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.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c
index 4a3084695c0..448c7724beb 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: