Skip to content

Commit

Permalink
[ARM] 4641/2: netX: fix kobject_name type
Browse files Browse the repository at this point in the history
With commit 5984a2f 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 <r.schwebel@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Robert Schwebel authored and Russell King committed Nov 5, 2007
1 parent c617360 commit 93e29a2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/arm/mach-netx/xc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 93e29a2

Please sign in to comment.