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

Commit 557dca5f authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] amba: fix amba device resources 



AMBA device resources were being reported as:

10004000-10004fff : <BAD>

This is because dev_name() was returning NULL prior to device_register.
Ensure that the struct device is properly initialized, and the name is
set before adding it to the device tree.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 65b1bfc1

drivers/amba/bus.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -207,6 +207,16 @@ int amba_device_register(struct amba_device *dev, struct resource *parent) 
	void __iomem *tmp;

	void __iomem *tmp;

	int i, ret;

	int i, ret;





	device_initialize(&dev->dev);



	/*

	 * Copy from device_add

	 */

	if (dev->dev.init_name) {

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

		dev->dev.init_name = NULL;

	}



	dev->dev.release = amba_device_release;

	dev->dev.release = amba_device_release;

	dev->dev.bus = &amba_bustype;

	dev->dev.bus = &amba_bustype;

	dev->dev.dma_mask = &dev->dma_mask;

	dev->dev.dma_mask = &dev->dma_mask;
@@ -240,7 +250,7 @@ int amba_device_register(struct amba_device *dev, struct resource *parent) 
		goto err_release;

		goto err_release;

	}

	}





	ret = device_register(&dev->dev);

	ret = device_add(&dev->dev);

	if (ret)

	if (ret)

		goto err_release;

		goto err_release;