[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20121203143153.956756838@decadent.org.uk>
Date: Mon, 03 Dec 2012 14:32:32 +0000
From: Ben Hutchings <ben@...adent.org.uk>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Jussi Pakkanen <jussi.pakkanen@...onical.com>,
Henrik Rydberg <rydberg@...omail.se>,
Dmitry Torokhov <dtor@...l.ru>
Subject: [ 46/89] Input: bcm5974 - set BUTTONPAD property
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jussi Pakkanen <jussi.pakkanen@...onical.com>
commit 52965cc012f7a3cf35f06485ec275ebf3b3fddae upstream.
Some bcm5974 trackpads have a physical button beneath the physical surface.
This patch sets the property bit so user space applications can detect the
trackpad type and act accordingly.
Signed-off-by: Jussi Pakkanen <jussi.pakkanen@...onical.com>
Reviewed-by: Henrik Rydberg <rydberg@...omail.se>
Signed-off-by: Dmitry Torokhov <dtor@...l.ru>
Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
---
drivers/input/mouse/bcm5974.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 5ec617e..913e9fa 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,
__set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
__set_bit(BTN_LEFT, input_dev->keybit);
+ if (cfg->caps & HAS_INTEGRATED_BUTTON)
+ __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
+
input_set_events_per_packet(input_dev, 60);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists