From fc301a7149631c81a2b67ede1f85b9c05a52c96d Mon Sep 17 00:00:00 2001
From: Liu Ying <victor.liu@nxp.com>
Date: Thu, 8 Nov 2018 17:01:56 +0800
Subject: [PATCH] MLK-20287 drm/imx: ldb: Check retval of sc_misc_set_control
in ldb_pixel_link_init
The return value of sc_misc_set_control() should be checked in
ldb_pixel_link_init(), instead of being ignored. This patch
fixes this issue.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
(cherry picked from commit 7c902e398dc3a4d6a77ba87b1ea1aaed906c8c50)
---
drivers/gpu/drm/imx/imx-ldb.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 58b7319c97c899..fc313889b0e510 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -1181,23 +1181,29 @@ static void ldb_pixel_link_init(int id, bool dual)
again:
if (id == 0) {
- sc_misc_set_control(ipcHndl, SC_R_MIPI_0, SC_C_MODE, 1);
+ sciErr = sc_misc_set_control(ipcHndl, SC_R_MIPI_0,
+ SC_C_MODE, 1);
if (sciErr != SC_ERR_NONE)
pr_err("SC_R_MIPI_%d MODE failed %d!\n", id, sciErr);
- sc_misc_set_control(ipcHndl, SC_R_MIPI_0, SC_C_DUAL_MODE, is_aux);
+ sciErr = sc_misc_set_control(ipcHndl, SC_R_MIPI_0,
+ SC_C_DUAL_MODE, is_aux);
if (sciErr != SC_ERR_NONE)
pr_err("SC_R_MIPI_%d DUAL_MODE failed %d!\n", id, sciErr);
- sc_misc_set_control(ipcHndl, SC_R_MIPI_0, SC_C_PXL_LINK_SEL, is_aux);
+ sciErr = sc_misc_set_control(ipcHndl, SC_R_MIPI_0,
+ SC_C_PXL_LINK_SEL, is_aux);
if (sciErr != SC_ERR_NONE)
pr_err("SC_R_MIPI_%d PXL_LINK_SEL failed %d!\n", id, sciErr);
} else {
- sc_misc_set_control(ipcHndl, SC_R_MIPI_1, SC_C_MODE, 1);
+ sciErr = sc_misc_set_control(ipcHndl, SC_R_MIPI_1,
+ SC_C_MODE, 1);
if (sciErr != SC_ERR_NONE)
pr_err("SC_R_MIPI_%d MODE failed %d!\n", id, sciErr);
- sc_misc_set_control(ipcHndl, SC_R_MIPI_1, SC_C_DUAL_MODE, is_aux);
+ sciErr = sc_misc_set_control(ipcHndl, SC_R_MIPI_1,
+ SC_C_DUAL_MODE, is_aux);
if (sciErr != SC_ERR_NONE)
pr_err("SC_R_MIPI_%d DUAL_MODE failed %d!\n", id, sciErr);
- sc_misc_set_control(ipcHndl, SC_R_MIPI_1, SC_C_PXL_LINK_SEL, is_aux);
+ sciErr = sc_misc_set_control(ipcHndl, SC_R_MIPI_1,
+ SC_C_PXL_LINK_SEL, is_aux);
if (sciErr != SC_ERR_NONE)
pr_err("SC_R_MIPI_%d PXL_LINK_SEL failed %d!\n", id, sciErr);
}
--
GitLab