From 1c12f1d47d0e3ee61f2e4a69ad6c9c60e1bbcc44 Mon Sep 17 00:00:00 2001
From: Benedikt Spranger <b.spranger@linutronix.de>
Date: Mon, 14 May 2012 18:48:17 +0200
Subject: [PATCH] --- yaml --- r: 304115 b: refs/heads/master c:
 94ca629e40eb7e997be21d8065c25e4f3797b03f h: refs/heads/master i:   304113:
 429e001d2599b7746e8b7b518d48c9016d5e194a   304111:
 aad36666ceb829f8c4780e0ea83810a9fe20ab82 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/uio/uio_pdrv_genirq.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 58b994e61fff..211a348054e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7458eab6f4527bce719703eb15fef1cff9e8d9e0
+refs/heads/master: 94ca629e40eb7e997be21d8065c25e4f3797b03f
diff --git a/trunk/drivers/uio/uio_pdrv_genirq.c b/trunk/drivers/uio/uio_pdrv_genirq.c
index b98371d93a92..42202cd83158 100644
--- a/trunk/drivers/uio/uio_pdrv_genirq.c
+++ b/trunk/drivers/uio/uio_pdrv_genirq.c
@@ -146,6 +146,14 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
 	priv->flags = 0; /* interrupt is enabled to begin with */
 	priv->pdev = pdev;
 
+	if (!uioinfo->irq) {
+		ret = platform_get_irq(pdev, 0);
+		if (ret < 0) {
+			dev_err(&pdev->dev, "failed to get IRQ\n");
+			goto bad0;
+		}
+		uioinfo->irq = ret;
+	}
 	uiomem = &uioinfo->mem[0];
 
 	for (i = 0; i < pdev->num_resources; ++i) {