diff options
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
-rw-r--r-- | arch/arm/mach-omap2/display.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index f86b72d1d59e..1444b4b4bd9f 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c | |||
@@ -83,6 +83,7 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes) | |||
83 | u32 enable_mask, enable_shift; | 83 | u32 enable_mask, enable_shift; |
84 | u32 pipd_mask, pipd_shift; | 84 | u32 pipd_mask, pipd_shift; |
85 | u32 reg; | 85 | u32 reg; |
86 | int ret; | ||
86 | 87 | ||
87 | if (dsi_id == 0) { | 88 | if (dsi_id == 0) { |
88 | enable_mask = OMAP4_DSI1_LANEENABLE_MASK; | 89 | enable_mask = OMAP4_DSI1_LANEENABLE_MASK; |
@@ -98,7 +99,11 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes) | |||
98 | return -ENODEV; | 99 | return -ENODEV; |
99 | } | 100 | } |
100 | 101 | ||
101 | regmap_read(omap4_dsi_mux_syscon, OMAP4_DSIPHY_SYSCON_OFFSET, ®); | 102 | ret = regmap_read(omap4_dsi_mux_syscon, |
103 | OMAP4_DSIPHY_SYSCON_OFFSET, | ||
104 | ®); | ||
105 | if (ret) | ||
106 | return ret; | ||
102 | 107 | ||
103 | reg &= ~enable_mask; | 108 | reg &= ~enable_mask; |
104 | reg &= ~pipd_mask; | 109 | reg &= ~pipd_mask; |