From 93e29a2ecaa8372c5bb9b996b8b43e03a7c37f3c Mon Sep 17 00:00:00 2001 From: Robert Schwebel Date: Mon, 5 Nov 2007 17:55:24 +0100 Subject: [PATCH] [ARM] 4641/2: netX: fix kobject_name type With commit 5984a2fc7e7c9ab118e78ae9799e98fc4ade40f9 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: Robert Schwebel Signed-off-by: Russell King --- arch/arm/mach-netx/xc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c index bd5184f..ca9c5b6 100644 --- a/arch/arm/mach-netx/xc.c +++ b/arch/arm/mach-netx/xc.c @@ -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)); -- 2.7.4