From: Kumar Gala <galak@freescale.com>
Date: Thu, 30 Jun 2005 09:58:55 +0000 (-0700)
Subject: [PATCH] ppc32: Fix pointer check for MPC8540 ADS device
X-Git-Tag: v2.6.13-rc2~52
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcbda35ca7470bf0123a7ae685899776f67814b2;p=linux-2.6

[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>
---

diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c
index ddd2e9a5bb..f761fdf160 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;