summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorJohan Hovold <johan+linaro@kernel.org>2023-02-02 16:54:31 +0100
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2023-02-09 23:17:56 +0100
commitcb9bb7b2364bb5f4f51226ce1f9ec6ffda618f0a (patch)
treed0c81b0021dce0f82fa40b9ad190388dc51eec39 /drivers/rtc
parent8d273f33fd090a2c270c67b6ac7fa03f5a7eee3f (diff)
downloadlinux-cb9bb7b2364bb5f4f51226ce1f9ec6ffda618f0a.tar.gz
linux-cb9bb7b2364bb5f4f51226ce1f9ec6ffda618f0a.tar.bz2
linux-cb9bb7b2364bb5f4f51226ce1f9ec6ffda618f0a.zip
rtc: pm8xxx: return IRQ_NONE on errors
In the unlikely event that disabling the alarm and clearing the status ever fails, return IRQ_NONE instead of IRQ_HANDLED. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Link: https://lore.kernel.org/r/20230202155448.6715-6-johan+linaro@kernel.org Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-pm8xxx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c
index 053a04f74a91..dc7e659cbb2a 100644
--- a/drivers/rtc/rtc-pm8xxx.c
+++ b/drivers/rtc/rtc-pm8xxx.c
@@ -291,14 +291,14 @@ static irqreturn_t pm8xxx_alarm_trigger(int irq, void *dev_id)
rc = regmap_update_bits(rtc_dd->regmap, regs->alarm_ctrl,
regs->alarm_en, 0);
if (rc)
- goto out;
+ return IRQ_NONE;
/* Clear RTC alarm register */
rc = regmap_update_bits(rtc_dd->regmap, regs->alarm_ctrl2,
PM8xxx_RTC_ALARM_CLEAR, 0);
if (rc)
- goto out;
-out:
+ return IRQ_NONE;
+
return IRQ_HANDLED;
}