diff --git a/[refs] b/[refs] index 1f91465940b3..819ef08d18b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 406dc00407edfa75c97123c7f8653e850358fb72 +refs/heads/master: ad819039f1aa5c5179ecdfb035ed2864d93e741e diff --git a/trunk/drivers/rtc/rtc-max77686.c b/trunk/drivers/rtc/rtc-max77686.c index 5a12b32f77ec..fb08b89c41e7 100644 --- a/trunk/drivers/rtc/rtc-max77686.c +++ b/trunk/drivers/rtc/rtc-max77686.c @@ -551,17 +551,17 @@ static int max77686_rtc_probe(struct platform_device *pdev) goto err_rtc; } virq = irq_create_mapping(max77686->irq_domain, MAX77686_RTCIRQ_RTCA1); - if (!virq) + if (!virq) { + ret = -ENXIO; goto err_rtc; + } info->virq = virq; ret = devm_request_threaded_irq(&pdev->dev, virq, NULL, max77686_rtc_alarm_irq, 0, "rtc-alarm0", info); - if (ret < 0) { + if (ret < 0) dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n", info->virq, ret); - goto err_rtc; - } err_rtc: return ret;