projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sunxi/soc2' into next/soc
[cascardo/linux.git]
/
drivers
/
uio
/
uio_pdrv_genirq.c
diff --git
a/drivers/uio/uio_pdrv_genirq.c
b/drivers/uio/uio_pdrv_genirq.c
index
b98371d
..
42202cd
100644
(file)
--- a/
drivers/uio/uio_pdrv_genirq.c
+++ b/
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;
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) {
uiomem = &uioinfo->mem[0];
for (i = 0; i < pdev->num_resources; ++i) {