---

yaml --- r: 304115 b: refs/heads/master c: 94ca629 h: refs/heads/master i: 304113: 429e001 304111: aad3666 v: v3
git-mirror · May 15, 2012 · 1c12f1d · 1c12f1d
1 parent fcd49a9
commit 1c12f1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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) {