summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQiushi Wu <wu000273@umn.edu>2020-05-03 21:22:35 +0300
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2020-05-11 17:21:50 +0300
commit8816cd726a4fee197af2d851cbe25991ae19ea14 (patch)
tree84e2044b3661541ee8b1e38eb173f7b88de5bb5e
parent32271efded6ca4e92d8f0647dce7fbd94f684a16 (diff)
downloadlinux-8816cd726a4fee197af2d851cbe25991ae19ea14.tar.xz
rtc: mc13xxx: fix a double-unlock issue
In function mc13xxx_rtc_probe, the mc13xxx_unlock() is called before rtc_register_device(). But in the error path of rtc_register_device(), the mc13xxx_unlock() is called again, which causes a double-unlock problem. Thus add a call of the function “mc13xxx_lock” in an if branch for the completion of the exception handling. Fixes: e4ae7023e182a ("rtc: mc13xxx: set range") Signed-off-by: Qiushi Wu <wu000273@umn.edu> Link: https://lore.kernel.org/r/20200503182235.1652-1-wu000273@umn.edu Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r--drivers/rtc/rtc-mc13xxx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
index afce2c0b4bd6..d6802e6191cb 100644
--- a/drivers/rtc/rtc-mc13xxx.c
+++ b/drivers/rtc/rtc-mc13xxx.c
@@ -308,8 +308,10 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
mc13xxx_unlock(mc13xxx);
ret = rtc_register_device(priv->rtc);
- if (ret)
+ if (ret) {
+ mc13xxx_lock(mc13xxx);
goto err_irq_request;
+ }
return 0;