summaryrefslogtreecommitdiff
path: root/arch/ppc
diff options
context:
space:
mode:
authorKumar Gala <galak@freescale.com>2005-06-30 02:58:55 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-30 08:45:09 -0700
commitbcbda35ca7470bf0123a7ae685899776f67814b2 (patch)
treed74f76794c2bc7806680c34eb23247ead732be2d /arch/ppc
parent6931dfc9f3f81d148b7ed0ab3fd796f8b986a995 (diff)
[PATCH] ppc32: Fix pointer check for MPC8540 ADS device
Editor snafu in which the call to ppc_sys_get_pdata got inside the if check instead of before it. Oops. Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/platforms/85xx/mpc8540_ads.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c
index ddd2e9a5bb12..f761fdf160db 100644
--- a/arch/ppc/platforms/85xx/mpc8540_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8540_ads.c
@@ -111,8 +111,8 @@ mpc8540ads_setup_arch(void)
memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
}
+ pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_FEC);
if (pdata) {
- pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_FEC);
pdata->board_flags = 0;
pdata->interruptPHY = MPC85xx_IRQ_EXT5;
pdata->phyid = 3;