diff --git a/[refs] b/[refs]
index 5bc3f334cf9c..0db04e837a3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0edba7ef89a64614e40023bf87ed5b402834e04
+refs/heads/master: 7fbc3a9b132e93b2ba1fd889c1ad8a4135731cc3
diff --git a/trunk/drivers/leds/leds-pca9532.c b/trunk/drivers/leds/leds-pca9532.c
index bd3b431c9710..3937244fdcab 100644
--- a/trunk/drivers/leds/leds-pca9532.c
+++ b/trunk/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 */