The patch titled
rtc-ds1307: typo fix found by coverity
has been added to the -mm tree. Its filename is
rtc-ds1307-typo-fix-found-by-coverity.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: rtc-ds1307: typo fix found by coverity
From: David Brownell <david-b@xxxxxxxxxxx>
Fix a typo turned up by a Coverity check: referring to the wrong register,
which could cause problems with DS1338 RTCs whose oscillators halted.
Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-ds1307.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/rtc/rtc-ds1307.c~rtc-ds1307-typo-fix-found-by-coverity drivers/rtc/rtc-ds1307.c
--- a/drivers/rtc/rtc-ds1307.c~rtc-ds1307-typo-fix-found-by-coverity
+++ a/drivers/rtc/rtc-ds1307.c
@@ -352,7 +352,7 @@ read_rtc:
/* oscillator fault? clear flag, and warn */
if (ds1307->regs[DS1307_REG_CONTROL] & DS1338_BIT_OSF) {
i2c_smbus_write_byte_data(client, DS1307_REG_CONTROL,
- ds1307->regs[DS1337_REG_CONTROL]
+ ds1307->regs[DS1307_REG_CONTROL]
& ~DS1338_BIT_OSF);
dev_warn(&client->dev, "SET TIME!\n");
goto read_rtc;
_
Patches currently in -mm which might be from david-b@xxxxxxxxxxx are
minor-gpio-doc-update.patch
rtc-stk17ta8-update-for-sysfs-api-change.patch
rtc-ds1307-typo-fix-found-by-coverity.patch
git-acpi.patch
git-mmc.patch
git-mtd.patch
drivers-pmc-msp71xx-gpio-char-driver.patch
driver-for-the-atmel-on-chip-ssc-on-at32ap-and-at91.patch
clean-up-duplicate-includes-in-drivers-spi.patch
spi-kerneldoc-update.patch
spi-device-setup-gets-better-error-checking.patch
rtc_irq_set_freq-requires-power-of-two-and-associated-kerneldoc.patch
use-menuconfig-objects-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
