Commit b6d2233f authored May 26, 2015 by Ricardo Ribalda Delgado Committed by Greg Kroah-Hartman Jun 01, 2015

of/platform: Use platform_device interface



of_platform_device_create_pdata() was using of_device_add() to create
the devices, but of_platform_device_destroy was using
platform_device_unregister() to free them.

of_device_add(), do not call insert_resource(), which initializes the
parent field of the resource structure, needed by release_resource(),
called by of_platform_device_destroy(). This leads to a NULL pointer
deference.

Instead of fixing the NULL pointer deference, what could hide other bugs,
this patch, replaces of_device_add() with platform_device_data().

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e50e69d1

drivers/of/platform.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -183,8 +183,9 @@ static struct platform_device *of_platform_device_create_pdata(
		dev->dev.bus = &platform_bus_type;
		dev->dev.platform_data = platform_data;
		of_dma_configure(&dev->dev, dev->dev.of_node);
		dev->name = dev_name(&dev->dev);

		if (of_device_add(dev) != 0) {
		if (platform_device_add(dev) != 0) {
		of_dma_deconfigure(&dev->dev);
		platform_device_put(dev);
		goto err_clear_flag;

Admin message