diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-14 08:53:42 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-14 08:53:42 -0400 |
| commit | b8ce9fb8e18af7466e0b915bb5979322cdace322 (patch) | |
| tree | eec6f9b58ce154fd863f0f78b374a697a5a7139b /arch/arm/mach-omap2/omap_phy_internal.c | |
| parent | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (diff) | |
| parent | e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 (diff) | |
Merge branch 'fixes-v3.0-rc3' into devel-fixes
Diffstat (limited to 'arch/arm/mach-omap2/omap_phy_internal.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_phy_internal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index f47813edd951..58775e3c8476 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c | |||
| @@ -56,8 +56,10 @@ int omap4430_phy_init(struct device *dev) | |||
| 56 | /* Power down the phy */ | 56 | /* Power down the phy */ |
| 57 | __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF); | 57 | __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF); |
| 58 | 58 | ||
| 59 | if (!dev) | 59 | if (!dev) { |
| 60 | iounmap(ctrl_base); | ||
| 60 | return 0; | 61 | return 0; |
| 62 | } | ||
| 61 | 63 | ||
| 62 | phyclk = clk_get(dev, "ocp2scp_usb_phy_ick"); | 64 | phyclk = clk_get(dev, "ocp2scp_usb_phy_ick"); |
| 63 | if (IS_ERR(phyclk)) { | 65 | if (IS_ERR(phyclk)) { |