---

yaml --- r: 365798 b: refs/heads/master c: 406dc00 h: refs/heads/master v: v3
git-mirror · Apr 30, 2013 · 16af322 · 16af322
1 parent 9249663
commit 16af322
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbda161be8ae43133bbeac34da3ad99ffeb63556
+refs/heads/master: 406dc00407edfa75c97123c7f8653e850358fb72
diff --git a/trunk/drivers/rtc/rtc-max8997.c b/trunk/drivers/rtc/rtc-max8997.c
@@ -491,20 +491,17 @@ static int max8997_rtc_probe(struct platform_device *pdev)
 	virq = irq_create_mapping(max8997->irq_domain, MAX8997_PMICIRQ_RTCA1);
 	if (!virq) {
 		dev_err(&pdev->dev, "Failed to create mapping alarm IRQ\n");
+		ret = -ENXIO;
 		goto err_out;
 	}
 	info->virq = virq;
 
 	ret = devm_request_threaded_irq(&pdev->dev, virq, NULL,
 				max8997_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_out;
-	}
-
-	return ret;
 
 err_out:
 	return ret;