The patch titled leds: fix &&/|| confusion has been added to the -mm tree. Its filename is leds-fix-confusion.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: leds: fix &&/|| confusion From: Roel Kluin <roel.kluin@xxxxxxxxx> Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> Cc: Roland Dreier <rdreier@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-fix-confusion drivers/leds/leds-pca9532.c --- a/drivers/leds/leds-pca9532.c~leds-fix-confusion +++ 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-fix-confusion.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