diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-10 08:37:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-10 08:37:35 -0700 |
| commit | 8171d5f7bf26849db51e8eda2bc19c92d7462606 (patch) | |
| tree | dd290ff06d5a9603ef2412208a3c85b7ad575cd8 | |
| parent | 8b2dcebae330fb6dffc7717b740aa4b2c4d00451 (diff) | |
| download | lwn-8171d5f7bf26849db51e8eda2bc19c92d7462606.tar.gz lwn-8171d5f7bf26849db51e8eda2bc19c92d7462606.zip | |
Revert "of/platform: Use platform_device interface"
This reverts commit b6d2233f2916fa9338786aeab2e936c5a07e4d0c as it
breaks working machines.
Cc: Rob Herring <robh@kernel.org>
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/of/platform.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index f011f57f835a..a01f57c9e34e 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -183,9 +183,8 @@ 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 (platform_device_add(dev) != 0) { + if (of_device_add(dev) != 0) { of_dma_deconfigure(&dev->dev); platform_device_put(dev); goto err_clear_flag; |