summaryrefslogtreecommitdiffstats
path: root/drivers/leds
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@iki.fi>2009-03-03 21:13:06 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-04-06 17:06:27 +0200
commit7fbc3a9b132e93b2ba1fd889c1ad8a4135731cc3 (patch)
treefb1ac8fcd39ab77fbd72454ed5735891f688363c /drivers/leds
parentleds: move h1940-leds's probe function to .devinit.text (diff)
downloadlinux-7fbc3a9b132e93b2ba1fd889c1ad8a4135731cc3.tar.xz
linux-7fbc3a9b132e93b2ba1fd889c1ad8a4135731cc3.zip
leds: Fix &&/|| confusion in leds-pca9532.c
This fixes the expression in the driver to do the correct thing, not that I think anyone would send SND_* without EV_SND. Thanks to Roel Kluin <roel.kluin@gmail.com> for noticing. Signed-off-by: Riku Voipio <riku.voipio@iki.fi> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds-pca9532.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
index bd3b431c9710..3937244fdcab 100644
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -169,7 +169,7 @@ static int pca9532_event(struct input_dev *dev, unsigned int type,
{
struct pca9532_data *data = input_get_drvdata(dev);
- if (type != EV_SND && (code != SND_BELL || code != SND_TONE))
+ if (!(type == EV_SND && (code == SND_BELL || code == SND_TONE)))
return -1;
/* XXX: allow different kind of beeps with psc/pwm modifications */