From e55a05e1e7bbff6cb31cb9fa1cee5564b1e999bc Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 23 Jun 2009 13:30:22 +0300
Subject: [PATCH] --- yaml --- r: 154543 b: refs/heads/master c:
 091a58af0ba1765d80b1e74382c7572baceb1bdc h: refs/heads/master i:   154541:
 7bd3d35cca12e434845e53ccdda91139396892a7   154539:
 33cbbea84ee0294525e958c145bf2d182d5fac5b   154535:
 bbe64329aa2c08e577c7d1649093e11e1bc432e8   154527:
 a745686d4ab206987383d0cdf292840b9322b41b v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-omap2/mailbox.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 87b5db1eae5c..04629b094f07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 762ad3a476baa1831f732488e80960f4aa024393
+refs/heads/master: 091a58af0ba1765d80b1e74382c7572baceb1bdc
diff --git a/trunk/arch/arm/mach-omap2/mailbox.c b/trunk/arch/arm/mach-omap2/mailbox.c
index fd5b8a5925cc..6f71f3730c97 100644
--- a/trunk/arch/arm/mach-omap2/mailbox.c
+++ b/trunk/arch/arm/mach-omap2/mailbox.c
@@ -282,12 +282,12 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	/* DSP or IVA2 IRQ */
-	mbox_dsp_info.irq = platform_get_irq(pdev, 0);
-	if (mbox_dsp_info.irq < 0) {
+	ret = platform_get_irq(pdev, 0);
+	if (ret < 0) {
 		dev_err(&pdev->dev, "invalid irq resource\n");
-		ret = -ENODEV;
 		goto err_dsp;
 	}
+	mbox_dsp_info.irq = ret;
 
 	ret = omap_mbox_register(&pdev->dev, &mbox_dsp_info);
 	if (ret)