The patch titled leds: always true: (x != 1 || x != 2) has been removed from the -mm tree. Its filename was leds-always-true-x-=-1-x-=-2.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: leds: always true: (x != 1 || x != 2) From: Roel Kluin <roel.kluin@xxxxxxxxx> see vi include/linux/input.h +710: #define SND_BELL 0x01 #define SND_TONE 0x02 so (code != SND_BELL || code != SND_TONE) is always true I think this was intended? (code != SND_BELL || code != SND_TONE) is always true. Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> Cc: Richard Purdie <rpurdie@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/leds/leds-pca9532.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/leds/leds-pca9532.c~leds-always-true-x-=-1-x-=-2 drivers/leds/leds-pca9532.c --- a/drivers/leds/leds-pca9532.c~leds-always-true-x-=-1-x-=-2 +++ a/drivers/leds/leds-pca9532.c @@ -169,7 +169,7 @@ static int pca9532_event(struct input_de { 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 */ _ Patches currently in -mm which might be from roel.kluin@xxxxxxxxx are linux-next.patch drm-fix-lock_test_with_return-macro.patch dvb-negative-internal-sub_range-wont-get-noticed.patch leds-always-true-x-=-1-x-=-2.patch paride-pgc-xs-confusion.patch mm-get_nid_for_pfn-returns-int.patch alpha-fix-macros.patch rtc-wm8350-retries-will-reach-1.patch ufs-sector_t-cannot-be-negative.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html