diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /drivers/leds/leds-pca9532.c | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/leds/leds-pca9532.c')
| -rw-r--r-- | drivers/leds/leds-pca9532.c | 2 |
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, | |||
| 169 | { | 169 | { |
| 170 | struct pca9532_data *data = input_get_drvdata(dev); | 170 | struct pca9532_data *data = input_get_drvdata(dev); |
| 171 | 171 | ||
| 172 | if (type != EV_SND && (code != SND_BELL || code != SND_TONE)) | 172 | if (!(type == EV_SND && (code == SND_BELL || code == SND_TONE))) |
| 173 | return -1; | 173 | return -1; |
| 174 | 174 | ||
| 175 | /* XXX: allow different kind of beeps with psc/pwm modifications */ | 175 | /* XXX: allow different kind of beeps with psc/pwm modifications */ |