diff options
author | Axel Lin <axel.lin@gmail.com> | 2010-11-22 01:27:13 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-11-22 01:32:17 -0500 |
commit | f09830ab15bfb7eb4e832e44189b5b5883309811 (patch) | |
tree | 7ca36efaf3b50fcd1eeaf9d5a0c071c2d29c8df3 | |
parent | ebcc019926269e7e123d55ec92ff00c2688ca343 (diff) |
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>
-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) | |||
191 | 191 | ||
192 | serio_register_port(ct82c710_port); | 192 | serio_register_port(ct82c710_port); |
193 | 193 | ||
194 | printk(KERN_INFO "serio: C&T 82c710 mouse port at %#llx irq %d\n", | ||
195 | (unsigned long long)CT82C710_DATA, CT82C710_IRQ); | ||
196 | |||
194 | return 0; | 197 | return 0; |
195 | } | 198 | } |
196 | 199 | ||
@@ -237,11 +240,6 @@ static int __init ct82c710_init(void) | |||
237 | if (error) | 240 | if (error) |
238 | goto err_free_device; | 241 | goto err_free_device; |
239 | 242 | ||
240 | serio_register_port(ct82c710_port); | ||
241 | |||
242 | printk(KERN_INFO "serio: C&T 82c710 mouse port at %#llx irq %d\n", | ||
243 | (unsigned long long)CT82C710_DATA, CT82C710_IRQ); | ||
244 | |||
245 | return 0; | 243 | return 0; |
246 | 244 | ||
247 | err_free_device: | 245 | err_free_device: |