From f5f36bab0af991e3e54927a200136f895590f87d Mon Sep 17 00:00:00 2001 From: Damian Hobson-Garcia Date: Fri, 16 Nov 2012 14:46:12 +0900 Subject: [PATCH] --- yaml --- r: 337013 b: refs/heads/master c: d5185c4eb3a022f7e7a435238c2b0b885e6b4821 h: refs/heads/master i: 337011: 583c6f7fdbbddbaa8b8c19941f1be2f7f22003de v: v3 --- [refs] | 2 +- trunk/drivers/uio/uio_dmem_genirq.c | 2 +- trunk/drivers/uio/uio_pdrv_genirq.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8e7185655213..efe093e5c451 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 439926c81c01f31f9ffa7af7bf2d242b7f794f3c +refs/heads/master: d5185c4eb3a022f7e7a435238c2b0b885e6b4821 diff --git a/trunk/drivers/uio/uio_dmem_genirq.c b/trunk/drivers/uio/uio_dmem_genirq.c index bbdf92559e3f..252434c9ea9d 100644 --- a/trunk/drivers/uio/uio_dmem_genirq.c +++ b/trunk/drivers/uio/uio_dmem_genirq.c @@ -153,7 +153,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) int ret = -EINVAL; int i; - if (!uioinfo) { + if (pdev->dev.of_node) { int irq; /* alloc uioinfo for one device */ diff --git a/trunk/drivers/uio/uio_pdrv_genirq.c b/trunk/drivers/uio/uio_pdrv_genirq.c index ac988ce62f2b..c122bca669b6 100644 --- a/trunk/drivers/uio/uio_pdrv_genirq.c +++ b/trunk/drivers/uio/uio_pdrv_genirq.c @@ -102,7 +102,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev) int ret = -EINVAL; int i; - if (!uioinfo) { + if (pdev->dev.of_node) { int irq; /* alloc uioinfo for one device */