projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2417898
)
drivers/rtc/rtc-stmp3xxx.c: check the return value from stmp_reset_block()
author
Fabio Estevam
<
[email protected]
>
Mon, 8 Jul 2013 23:00:45 +0000
(16:00 -0700)
committer
Linus Torvalds
<
[email protected]
>
Tue, 9 Jul 2013 17:33:25 +0000
(10:33 -0700)
stmp_reset_block() may fail, so let's check its return value and
propagate it in the case of error.
Signed-off-by: Fabio Estevam <
[email protected]
>
Acked-by: Shawn Guo <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/rtc/rtc-stmp3xxx.c
patch
|
blob
|
history
diff --git
a/drivers/rtc/rtc-stmp3xxx.c
b/drivers/rtc/rtc-stmp3xxx.c
index 90a3e864b8fe0c7d1a2efcf7a7551f1c10683610..767fee2ab340efb2d5ce647637053028c38b4aec 100644
(file)
--- a/
drivers/rtc/rtc-stmp3xxx.c
+++ b/
drivers/rtc/rtc-stmp3xxx.c
@@
-261,7
+261,12
@@
static int stmp3xxx_rtc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, rtc_data);
- stmp_reset_block(rtc_data->io);
+ err = stmp_reset_block(rtc_data->io);
+ if (err) {
+ dev_err(&pdev->dev, "stmp_reset_block failed: %d\n", err);
+ return err;
+ }
+
writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN |
STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,