Patchwork [U-Boot,29/31] powerpc/usb: Fix usb device-tree fix-up

login
register
mail settings
Submitter York Sun
Date March 22, 2013, 5:29 p.m.
Message ID <1363973369-26110-29-git-send-email-yorksun@freescale.com>
Download mbox | patch
Permalink /patch/230204/
State Superseded
Headers show

Comments

York Sun - March 22, 2013, 5:29 p.m.
From: Ramneek Mehresh <ramneek.mehresh@freescale.com>

Fix USB device-tree fixup to properly handle device-tree fixup and
print appropriate message when wrong/junk "dr_mode" or "phy_type"
are mentioned in hwconfig string

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
---
 arch/powerpc/cpu/mpc8xxx/fdt.c |    6 ++++++
 1 file changed, 6 insertions(+)
Wolfgang Denk - March 22, 2013, 9:04 p.m.
Dear York Sun,

In message <1363973369-26110-29-git-send-email-yorksun@freescale.com> you wrote:
> From: Ramneek Mehresh <ramneek.mehresh@freescale.com>
> 
> Fix USB device-tree fixup to properly handle device-tree fixup and
> print appropriate message when wrong/junk "dr_mode" or "phy_type"
> are mentioned in hwconfig string
> 
> Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
> ---
>  arch/powerpc/cpu/mpc8xxx/fdt.c |    6 ++++++
>  1 file changed, 6 insertions(+)

WARNING: quoted string split across lines
#126: FILE: arch/powerpc/cpu/mpc8xxx/fdt.c:172:
+                               printf("WARNING: wrong usb mode/phy"
+                                       " defined!!\n");


Best regards,

Wolfgang Denk

Patch

diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index 2847094..413e184 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -167,6 +167,12 @@  void fdt_fixup_dr_usb(void *blob, bd_t *bd)
 				}
 			}
 
+			if (mode_idx < 0 || phy_idx < 0) {
+				printf("WARNING: wrong usb mode/phy"
+					" defined!!\n");
+				return;
+			}
+
 			dr_mode_type = modes[mode_idx];
 			dr_phy_type = phys[phy_idx];