diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-20 18:40:23 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-20 18:40:23 +1100 |
| commit | 072ef40e08a71aae4ff2835e3c7f601b29daf227 (patch) | |
| tree | 00ec938af2b940b2ca605a14ce1695890540397c /arch/powerpc/platforms/83xx/usb.c | |
| parent | 2b46b5673ca67d23302c2afac045def988a3cade (diff) | |
| parent | bebfa06c61da6246d4aab38efa06a460eb3db4ed (diff) | |
| download | blackbird-op-linux-072ef40e08a71aae4ff2835e3c7f601b29daf227.tar.gz blackbird-op-linux-072ef40e08a71aae4ff2835e3c7f601b29daf227.zip | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/platforms/83xx/usb.c')
| -rw-r--r-- | arch/powerpc/platforms/83xx/usb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c index eafe7605cdac..b45160f8d084 100644 --- a/arch/powerpc/platforms/83xx/usb.c +++ b/arch/powerpc/platforms/83xx/usb.c @@ -130,7 +130,7 @@ int mpc831x_usb_cfg(void) out_be32(immap + MPC83XX_SCCR_OFFS, temp); /* Configure pin mux for ULPI. There is no pin mux for UTMI */ - if (!strcmp(prop, "ulpi")) { + if (prop && !strcmp(prop, "ulpi")) { temp = in_be32(immap + MPC83XX_SICRL_OFFS); temp &= ~MPC831X_SICRL_USB_MASK; temp |= MPC831X_SICRL_USB_ULPI; @@ -153,13 +153,13 @@ int mpc831x_usb_cfg(void) usb_regs = ioremap(res.start, res.end - res.start + 1); /* Using on-chip PHY */ - if (!strcmp(prop, "utmi_wide") || - !strcmp(prop, "utmi")) { + if (prop && (!strcmp(prop, "utmi_wide") || + !strcmp(prop, "utmi"))) { /* Set UTMI_PHY_EN, REFSEL to 48MHZ */ out_be32(usb_regs + FSL_USB2_CONTROL_OFFS, CONTROL_UTMI_PHY_EN | CONTROL_REFSEL_48MHZ); /* Using external UPLI PHY */ - } else if (!strcmp(prop, "ulpi")) { + } else if (prop && !strcmp(prop, "ulpi")) { /* Set PHY_CLK_SEL to ULPI */ temp = CONTROL_PHY_CLK_SEL_ULPI; #ifdef CONFIG_USB_OTG |
