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

Commit 06563581 authored by Kevin Hilman's avatar Kevin Hilman Committed by Paul Walmsley
Browse files

OMAP: omap_device: ensure hwmod tracks attached omap_device pointer 



The omap_hwmod struct has a field to track the omap_device that is
attached to it, but it was not being assigned.  Fix by assigning omap_device
pointer when omap_device is built.

Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
[paul@pwsan.com: use an array index rather than pointer arithmetic]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 681fddc6

arch/arm/plat-omap/omap_device.c

+4 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ struct omap_device *omap_device_build_ss(const char *pdev_name, int pdev_id, 
	struct omap_device *od;

	char *pdev_name2;

	struct resource *res = NULL;

	int res_count;

	int i, res_count;

	struct omap_hwmod **hwmods;



	if (!ohs || oh_cnt == 0 || !pdev_name)
@@ -416,6 +416,9 @@ struct omap_device *omap_device_build_ss(const char *pdev_name, int pdev_id, 
	else

		ret = omap_device_register(od);



	for (i = 0; i < oh_cnt; i++)

		hwmods[i]->od = od;



	if (ret)

		goto odbs_exit4;