aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-12 15:40:41 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-12 15:40:41 -0500
commit2485a4b610171f4e1c4ab0d053569747795c1bbe (patch)
tree1a4532e447c2640bc1378e25e1ead9a7ba7847a5 /drivers/input/mouse
parent6733e54b669c600eb8e451939ad55130db664fed (diff)
parent52965cc012f7a3cf35f06485ec275ebf3b3fddae (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: Input: bcm5974 - set BUTTONPAD property Input: serio_raw - return proper result when serio_raw_write fails Input: serio_raw - really signal HUP upon disconnect Input: serio_raw - remove stray semicolon Input: revert some over-zealous conversions to module_platform_driver()
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r--drivers/input/mouse/amimouse.c16
-rw-r--r--drivers/input/mouse/bcm5974.c3
2 files changed, 17 insertions, 2 deletions
diff --git a/drivers/input/mouse/amimouse.c b/drivers/input/mouse/amimouse.c
index 39be7b82c046..ff5f61a0fd3a 100644
--- a/drivers/input/mouse/amimouse.c
+++ b/drivers/input/mouse/amimouse.c
@@ -140,13 +140,25 @@ static int __exit amimouse_remove(struct platform_device *pdev)
140} 140}
141 141
142static struct platform_driver amimouse_driver = { 142static struct platform_driver amimouse_driver = {
143 .probe = amimouse_probe,
144 .remove = __exit_p(amimouse_remove), 143 .remove = __exit_p(amimouse_remove),
145 .driver = { 144 .driver = {
146 .name = "amiga-mouse", 145 .name = "amiga-mouse",
147 .owner = THIS_MODULE, 146 .owner = THIS_MODULE,
148 }, 147 },
149}; 148};
150module_platform_driver(amimouse_driver); 149
150static int __init amimouse_init(void)
151{
152 return platform_driver_probe(&amimouse_driver, amimouse_probe);
153}
154
155module_init(amimouse_init);
156
157static void __exit amimouse_exit(void)
158{
159 platform_driver_unregister(&amimouse_driver);
160}
161
162module_exit(amimouse_exit);
151 163
152MODULE_ALIAS("platform:amiga-mouse"); 164MODULE_ALIAS("platform:amiga-mouse");
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index cf87f8b18e34..927e479c2649 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -433,6 +433,9 @@ static void setup_events_to_report(struct input_dev *input_dev,
433 __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit); 433 __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
434 __set_bit(BTN_LEFT, input_dev->keybit); 434 __set_bit(BTN_LEFT, input_dev->keybit);
435 435
436 if (cfg->caps & HAS_INTEGRATED_BUTTON)
437 __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
438
436 input_set_events_per_packet(input_dev, 60); 439 input_set_events_per_packet(input_dev, 60);
437} 440}
438 441