|
@@ -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);
|
|
|
|
- if (err != 0) {
|
|
|
|
|
|
+ retval = hpet_register_irq_handler(cmos_interrupt);
|
|
|
|
+ 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;
|