Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 717ba911 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android

parents 962393f1 1f18cad5

drivers/of/platform.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ struct platform_device *of_device_alloc(struct device_node *np, 
	}



	dev->dev.of_node = of_node_get(np);

	dev->dev.parent = parent;

	dev->dev.parent = parent ? : &platform_bus;



	if (bus_id)

		dev_set_name(&dev->dev, "%s", bus_id);
@@ -291,7 +291,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, 


	/* setup generic device info */

	dev->dev.of_node = of_node_get(node);

	dev->dev.parent = parent;

	dev->dev.parent = parent ? : &platform_bus;

	dev->dev.platform_data = platform_data;

	if (bus_id)

		dev_set_name(&dev->dev, "%s", bus_id);