drivers: uio: Only allocate new private data when probing device tree node
authorDamian Hobson-Garcia <dhobsong@igel.co.jp>
Fri, 16 Nov 2012 05:46:12 +0000 (14:46 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Nov 2012 21:44:10 +0000 (13:44 -0800)
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.wu@intel.com>
Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Cc: "Hans J. Koch" <hjk@hansjkoch.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/uio/uio_dmem_genirq.c
drivers/uio/uio_pdrv_genirq.c

Simple merge
Simple merge