summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorHema HK <hemahk@ti.com>2011-03-24 12:38:42 +0100
committerFelipe Balbi <balbi@ti.com>2011-05-18 12:39:51 +0200
commit8cfc67f0740cede2a6aec94b8513285d00c46d5f (patch)
tree5bb67d5bed8845c9ae6e80170098de2f513dc168 /arch/arm
parentusb: musb: am35x: fix compile error when building am35x (diff)
downloadlinux-8cfc67f0740cede2a6aec94b8513285d00c46d5f.tar.xz
linux-8cfc67f0740cede2a6aec94b8513285d00c46d5f.zip
usb: otg: OMAP4430: Fixing the omap4430_phy_init function
omap4430_phy_init() function can be called with no device pointer, to powerdown the PHY during board init when USB is disabled. Fix the function accordingly. Signed-off-by: Hema HK <hemahk@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/omap_phy_internal.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c
index eff6e248b562..f47813edd951 100644
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -50,13 +50,16 @@ int omap4430_phy_init(struct device *dev)
{
ctrl_base = ioremap(OMAP443X_SCM_BASE, SZ_1K);
if (!ctrl_base) {
- dev_err(dev, "control module ioremap failed\n");
+ pr_err("control module ioremap failed\n");
return -ENOMEM;
}
/* Power down the phy */
__raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF);
- phyclk = clk_get(dev, "ocp2scp_usb_phy_ick");
+ if (!dev)
+ return 0;
+
+ phyclk = clk_get(dev, "ocp2scp_usb_phy_ick");
if (IS_ERR(phyclk)) {
dev_err(dev, "cannot clk_get ocp2scp_usb_phy_ick\n");
iounmap(ctrl_base);