summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/msm
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-09 01:32:24 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-09 01:32:24 -0800
commit456e674b52dafb680aa7e5540f00bdbe44783a7d (patch)
treeb0d46f706c54943c89f23b8a9c80cb899f4871b1 /drivers/video/fbdev/msm
parent1939b80fcdab2e8ebe74ad810924e98bf0ae3105 (diff)
parentd2af4b28d81b1a8985a0ae273fdb86f8405e8ac8 (diff)
Merge "msm: mdss: Avoid incorrect status while parsing dsi topology"
Diffstat (limited to 'drivers/video/fbdev/msm')
-rw-r--r--drivers/video/fbdev/msm/mdss_dsi_panel.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dsi_panel.c b/drivers/video/fbdev/msm/mdss_dsi_panel.c
index 29288f0bca74..c3ae4c1f8c17 100644
--- a/drivers/video/fbdev/msm/mdss_dsi_panel.c
+++ b/drivers/video/fbdev/msm/mdss_dsi_panel.c
@@ -1494,8 +1494,9 @@ static int mdss_dsi_parse_topology_config(struct device_node *np,
goto end;
}
}
- rc = of_property_read_string(cfg_np, "qcom,split-mode", &data);
- if (!rc && !strcmp(data, "pingpong-split"))
+
+ if (!of_property_read_string(cfg_np, "qcom,split-mode",
+ &data) && !strcmp(data, "pingpong-split"))
pinfo->use_pingpong_split = true;
if (((timing->lm_widths[0]) || (timing->lm_widths[1])) &&