summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-18 10:23:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-18 10:23:40 -0800
commite9cf59aeeea49ae84ffcf0e28699b46d705e85f0 (patch)
tree7aae7ea622b3bc71953aeee9ca302660e95a4f51 /drivers/input/keyboard
parent7c45512df987c5619db041b5c9b80d281e26d3db (diff)
parent9937c026820baabd1e908a9c1e6bdc846293000a (diff)
downloadblackbird-op-linux-e9cf59aeeea49ae84ffcf0e28699b46d705e85f0.tar.gz
blackbird-op-linux-e9cf59aeeea49ae84ffcf0e28699b46d705e85f0.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov: "Two small driver fixups and a documentation update for managed input devices" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - fix wacom_set_report retry logic Input: document that unregistering managed devices is not necessary Input: lm8323 - fix checking PWM interrupt status
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r--drivers/input/keyboard/lm8323.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index 93c812662134..0de23f41b2d3 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -398,7 +398,7 @@ static irqreturn_t lm8323_irq(int irq, void *_lm)
lm8323_configure(lm);
}
for (i = 0; i < LM8323_NUM_PWMS; i++) {
- if (ints & (1 << (INT_PWM1 + i))) {
+ if (ints & (INT_PWM1 << i)) {
dev_vdbg(&lm->client->dev,
"pwm%d engine completed\n", i);
pwm_done(&lm->pwm[i]);
OpenPOWER on IntegriCloud