The patch titled watchdog: add support for the WM8350 watchdog has been added to the -mm tree. Its filename is rtc-rtc-wm8350-add-support-for-wm8350-rtc-update-3.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: watchdog: add support for the WM8350 watchdog From: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Since last submission the driver has been changed to use bit zero rather than bit 1 when using test_and_set_bit() to ensure that we only have one user. Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx> Cc: David Brownell <david-b@xxxxxxxxxxx> Cc: Liam Girdwood <linux@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/watchdog/wm8350_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/watchdog/wm8350_wdt.c~rtc-rtc-wm8350-add-support-for-wm8350-rtc-update-3 drivers/watchdog/wm8350_wdt.c --- a/drivers/watchdog/wm8350_wdt.c~rtc-rtc-wm8350-add-support-for-wm8350-rtc-update-3 +++ a/drivers/watchdog/wm8350_wdt.c @@ -123,7 +123,7 @@ static int wm8350_wdt_open(struct inode if (!wm8350) return -ENODEV; - if (test_and_set_bit(1, &wm8350_wdt_users)) + if (test_and_set_bit(0, &wm8350_wdt_users)) return -EBUSY; ret = wm8350_wdt_start(wm8350); @@ -144,7 +144,7 @@ static int wm8350_wdt_release(struct ino wm8350_wdt_kick(wm8350); } - clear_bit(1, &wm8350_wdt_users); + clear_bit(0, &wm8350_wdt_users); return 0; } _ Patches currently in -mm which might be from broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx are rtc-fix-handling-of-missing-tm_year-data-when-reading-alarms.patch linux-next.patch watchdog-add-support-for-the-wm8350-watchdog.patch rtc-rtc-wm8350-add-support-for-wm8350-rtc-update-3.patch rtc-rtc-wm8350-add-support-for-wm8350-rtc.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