projects/linux·commit bcbda35c

[PATCH] ppc32: Fix pointer check for MPC8540 ADS device

bcbda35c · Kumar Gala <[email protected]> · 2005-06-30 02:58:55 -07:00

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 <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
bcbda35ca7470bf0123a7ae685899776f67814b2
Parents
6931dfc9

Changes

1 files changed · +1 −1

FileStatusAddDelContent
arch/ppc/platforms/85xx/mpc8540_ads.cmodified+1−1View file

arch/ppc/platforms/85xx/mpc8540_ads.c

View file
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c
index ddd2e9a..f761fdf 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;