diff options
| author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2015-05-26 09:31:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-01 10:15:17 +0900 |
| commit | b6d2233f2916fa9338786aeab2e936c5a07e4d0c (patch) | |
| tree | 240b9538c9291219491d3d394fd8af4a17707232 | |
| parent | e50e69d1ac4232af0b6890f16929bf5ceee81538 (diff) | |
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>
| -rw-r--r-- | drivers/of/platform.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index a01f57c9e34e..f011f57f835a 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -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; |