[PATCH] RTC: rtc-ds1553, rtc-ds1742 update
Check return value of sysfs_create_bin_file(). Fix polarity of RTC_BATT_FLAG bit in DS1742. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
90b4d648f0
Коммит
391b1fe67d
|
@ -18,7 +18,7 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#define DRV_VERSION "0.1"
|
||||
#define DRV_VERSION "0.2"
|
||||
|
||||
#define RTC_REG_SIZE 0x2000
|
||||
#define RTC_OFFSET 0x1ff0
|
||||
|
@ -357,9 +357,13 @@ static int __init ds1553_rtc_probe(struct platform_device *pdev)
|
|||
pdata->rtc = rtc;
|
||||
pdata->last_jiffies = jiffies;
|
||||
platform_set_drvdata(pdev, pdata);
|
||||
sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
|
||||
ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
|
||||
if (ret)
|
||||
goto out;
|
||||
return 0;
|
||||
out:
|
||||
if (pdata->rtc)
|
||||
rtc_device_unregister(pdata->rtc);
|
||||
if (pdata->irq >= 0)
|
||||
free_irq(pdata->irq, pdev);
|
||||
if (ioaddr)
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#define DRV_VERSION "0.1"
|
||||
#define DRV_VERSION "0.2"
|
||||
|
||||
#define RTC_REG_SIZE 0x800
|
||||
#define RTC_OFFSET 0x7f8
|
||||
|
@ -196,7 +196,7 @@ static int __init ds1742_rtc_probe(struct platform_device *pdev)
|
|||
writeb(sec, ioaddr + RTC_SECONDS);
|
||||
writeb(cen & RTC_CENTURY_MASK, ioaddr + RTC_CONTROL);
|
||||
}
|
||||
if (readb(ioaddr + RTC_DAY) & RTC_BATT_FLAG)
|
||||
if (!(readb(ioaddr + RTC_DAY) & RTC_BATT_FLAG))
|
||||
dev_warn(&pdev->dev, "voltage-low detected.\n");
|
||||
|
||||
rtc = rtc_device_register(pdev->name, &pdev->dev,
|
||||
|
@ -208,9 +208,13 @@ static int __init ds1742_rtc_probe(struct platform_device *pdev)
|
|||
pdata->rtc = rtc;
|
||||
pdata->last_jiffies = jiffies;
|
||||
platform_set_drvdata(pdev, pdata);
|
||||
sysfs_create_bin_file(&pdev->dev.kobj, &ds1742_nvram_attr);
|
||||
ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1742_nvram_attr);
|
||||
if (ret)
|
||||
goto out;
|
||||
return 0;
|
||||
out:
|
||||
if (pdata->rtc)
|
||||
rtc_device_unregister(pdata->rtc);
|
||||
if (ioaddr)
|
||||
iounmap(ioaddr);
|
||||
if (pdata->baseaddr)
|
||||
|
|
Загрузка…
Ссылка в новой задаче