Skip to contentSkip to conversation

uio_pdrv_genirq: don't re-setup irq if already configured by OF

PATCH New Anatolij Gustschin 1 participant 1 message Jan 29, 2013 Userspace I/O (UIO)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 uio_pdrv_genirq: don't re-setup irq if already configured by OF

If an OF node doesn't specify an interrupt property, 'uioinfo->irq' will be assigned to the UIO_IRQ_NONE value meaning no interrupt support. Trying to re-setup the irq later results in an error again and probing fails. To prevent this do not try to re-setup the irq if it was configured to UIO_IRQ_NONE by OF related code.

---
 drivers/uio/uio_pdrv_genirq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/uio/uio_pdrv_genirq.c +1 -1
index c122bca..16f7ae4 100644
@@ -146,7 +146,7 @@ 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) {
+	if (!pdev->dev.of_node && !uioinfo->irq) {
 		ret = platform_get_irq(pdev, 0);
 		if (ret < 0) {
 			dev_err(&pdev->dev, "failed to get IRQ\n");
Signature · 1 line
1.7.5.4