aboutsummaryrefslogtreecommitdiff
path: root/drivers/rtc/mc13783-rtc.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD2008-09-01 23:06:23 +0200
committerWolfgang Denk2008-09-07 00:56:36 +0200
commitd1e2319414ea5218ba801163e4530ecf2dfcbf36 (patch)
tree78c74e4a7a154c267bfcc1812d3493f7d4f979c9 /drivers/rtc/mc13783-rtc.c
parentee9536a28cb149bcb6c5dee9d08c62c91f4c72d2 (diff)
rtc: allow rtc_set to return an error and use it in cmd_date
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'drivers/rtc/mc13783-rtc.c')
-rw-r--r--drivers/rtc/mc13783-rtc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/rtc/mc13783-rtc.c b/drivers/rtc/mc13783-rtc.c
index b6e15014bb6..6ea91378897 100644
--- a/drivers/rtc/mc13783-rtc.c
+++ b/drivers/rtc/mc13783-rtc.c
@@ -77,7 +77,7 @@ int rtc_get(struct rtc_time *rtc)
return 0;
}
-void rtc_set(struct rtc_time *rtc)
+int rtc_set(struct rtc_time *rtc)
{
u32 time, day, reg;
@@ -86,7 +86,7 @@ void rtc_set(struct rtc_time *rtc)
slave = spi_setup_slave(1, 0, 1000000,
SPI_MODE_2 | SPI_CS_HIGH);
if (!slave)
- return;
+ return -1;
}
time = mktime(rtc->tm_year, rtc->tm_mon, rtc->tm_mday,
@@ -95,7 +95,7 @@ void rtc_set(struct rtc_time *rtc)
time %= 86400;
if (spi_claim_bus(slave))
- return;
+ return -1;
reg = 0x2c000000 | day | 0x80000000;
spi_xfer(slave, 32, (uchar *)&reg, (uchar *)&day,
@@ -106,6 +106,8 @@ void rtc_set(struct rtc_time *rtc)
SPI_XFER_BEGIN | SPI_XFER_END);
spi_release_bus(slave);
+
+ return -1;
}
void rtc_reset(void)