Commit 24b34472 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

drivers/rtc/rtc-cmos.c: propagate hpet_register_irq_handler() failure

If hpet_register_irq_handler() fails, cmos_do_probe() will incorrectly
return 0.
Reported-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9d2b7e53
...@@ -756,11 +756,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) ...@@ -756,11 +756,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
irq_handler_t rtc_cmos_int_handler; irq_handler_t rtc_cmos_int_handler;
if (is_hpet_enabled()) { if (is_hpet_enabled()) {
int err;
rtc_cmos_int_handler = hpet_rtc_interrupt; rtc_cmos_int_handler = hpet_rtc_interrupt;
err = hpet_register_irq_handler(cmos_interrupt); retval = hpet_register_irq_handler(cmos_interrupt);
if (err != 0) { if (retval) {
dev_warn(dev, "hpet_register_irq_handler " dev_warn(dev, "hpet_register_irq_handler "
" failed in rtc_init()."); " failed in rtc_init().");
goto cleanup1; goto cleanup1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment