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

Commit 93e29a2e authored by Robert Schwebel's avatar Robert Schwebel Committed by Russell King
Browse files

[ARM] 4641/2: netX: fix kobject_name type 



With commit 5984a2fc kobject_name() is
correctly being used to access the name field of kobj, but that function
needs a pointer to a kobject, not the kobject itself.

Signed-off-by: default avatarRobert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c617360a

arch/arm/mach-netx/xc.c

+3 −3
Original line number Diff line number Diff line
@@ -190,15 +190,15 @@ struct xc *request_xc(int xcno, struct device *dev) 
		goto exit;



	if (!request_mem_region

	    (NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, kobject_name(dev->kobj)))

	    (NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, kobject_name(&dev->kobj)))

		goto exit_free;



	if (!request_mem_region

	    (NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, kobject_name(dev->kobj)))

	    (NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, kobject_name(&dev->kobj)))

		goto exit_release_1;



	if (!request_mem_region

	    (SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, kobject_name(dev->kobj)))

	    (SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, kobject_name(&dev->kobj)))

		goto exit_release_2;



	x->xpec_base = (void * __iomem)io_p2v(NETX_PA_XPEC(xcno));