Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit bcbda35ca7470bf0123a7ae685899776f67814b2

Authored by Kumar Gala
Committed by Linus Torvalds
1 parent 6931dfc9f3
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/ppc/platforms/85xx/mpc8540_ads.c
Diff comments   View file @ bcbda35
... ... @@ -111,8 +111,8 @@
111 111 memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
112 112 }
113 113  
  114 + pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_FEC);
114 115 if (pdata) {
115   - pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_FEC);
116 116 pdata->board_flags = 0;
117 117 pdata->interruptPHY = MPC85xx_IRQ_EXT5;
118 118 pdata->phyid = 3;