[PATCH 4/4] drivers: uio: Only allocate new private data when probing device tree node

2012-11-15 Thread Damian Hobson-Garcia 
The same condition should be used both when allocating and freeing the
driver private data.  When dev.of_node is non NULL, allocate a new
private data structure, otherwise use the values from the platform data.

Reported-by: Fengguang Wu 

Signed-off-by: Damian Hobson-Garcia 
---
 drivers/uio/uio_dmem_genirq.c |2 +-
 drivers/uio/uio_pdrv_genirq.c |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c
index bbdf925..252434c 100644
--- a/drivers/uio/uio_dmem_genirq.c
+++ b/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/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 42202cd..45fcceb 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/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 */
-- 
1.7.5.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 4/4] drivers: uio: Only allocate new private data when probing device tree node

2012-11-15 Thread Damian Hobson-Garcia 
The same condition should be used both when allocating and freeing the
driver private data.  When dev.of_node is non NULL, allocate a new
private data structure, otherwise use the values from the platform data.

Reported-by: Fengguang Wu fengguang...@intel.com

Signed-off-by: Damian Hobson-Garcia dhobs...@igel.co.jp
---
 drivers/uio/uio_dmem_genirq.c |2 +-
 drivers/uio/uio_pdrv_genirq.c |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c
index bbdf925..252434c 100644
--- a/drivers/uio/uio_dmem_genirq.c
+++ b/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/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 42202cd..45fcceb 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/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 */
-- 
1.7.5.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/