Skip to content

Commit 41d318c

Browse files
committed
Merge tag 'rtc-6.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fixes from Alexandre Belloni: "The two reverts are for patches that I shouldn't have applied. The rx8025 patch fixes an issue present since 2022: - cpcap, tps6586x: revert incorrect irq enable/disable balance fix - rx8025: fix incorrect register reference" * tag 'rtc-6.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: rx8025: fix incorrect register reference Revert "rtc: cpcap: Fix initial enable_irq/disable_irq balance" Revert "rtc: tps6586x: Fix initial enable_irq/disable_irq balance"
2 parents 7bb4d65 + 162f24c commit 41d318c

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

drivers/rtc/rtc-cpcap.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ static int cpcap_rtc_probe(struct platform_device *pdev)
268268
return err;
269269

270270
rtc->alarm_irq = platform_get_irq(pdev, 0);
271-
rtc->alarm_enabled = true;
272271
err = devm_request_threaded_irq(dev, rtc->alarm_irq, NULL,
273272
cpcap_rtc_alarm_irq,
274273
IRQF_TRIGGER_NONE | IRQF_ONESHOT,

drivers/rtc/rtc-rx8025.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ static int rx8025_init_client(struct i2c_client *client)
316316
return hour_reg;
317317
rx8025->is_24 = (hour_reg & RX8035_BIT_HOUR_1224);
318318
} else {
319-
rx8025->is_24 = (ctrl[1] & RX8025_BIT_CTRL1_1224);
319+
rx8025->is_24 = (ctrl[0] & RX8025_BIT_CTRL1_1224);
320320
}
321321
out:
322322
return err;

drivers/rtc/rtc-tps6586x.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
258258

259259
irq_set_status_flags(rtc->irq, IRQ_NOAUTOEN);
260260

261-
rtc->irq_en = true;
262261
ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
263262
tps6586x_rtc_irq,
264263
IRQF_ONESHOT,

0 commit comments

Comments
 (0)