From 6048c31f6dcdb02abd5b4f95be1f6700909d6e85 Mon Sep 17 00:00:00 2001 From: Aravind Venkateswaran Date: Tue, 26 Jan 2016 14:37:04 -0800 Subject: [PATCH] msm: mdss: dsi: propagate error on read command failures When panel read command API fails, propagate the error up so that the caller can take any necessary actions. CRs-Fixed: 960973 Change-Id: I397f4d47c6343abbab12833a47b753dc3bdb98f0 Signed-off-by: Aravind Venkateswaran --- drivers/video/fbdev/msm/mdss_dsi.h | 2 +- drivers/video/fbdev/msm/mdss_dsi_panel.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_dsi.h b/drivers/video/fbdev/msm/mdss_dsi.h index b28ffc4456f8..a836d6c1adfc 100644 --- a/drivers/video/fbdev/msm/mdss_dsi.h +++ b/drivers/video/fbdev/msm/mdss_dsi.h @@ -617,7 +617,7 @@ void mdss_dsi_dln0_phy_err(struct mdss_dsi_ctrl_pdata *ctrl, bool print_en); void mdss_dsi_lp_cd_rx(struct mdss_dsi_ctrl_pdata *ctrl); void mdss_dsi_get_hw_revision(struct mdss_dsi_ctrl_pdata *ctrl); void mdss_dsi_read_phy_revision(struct mdss_dsi_ctrl_pdata *ctrl); -u32 mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0, +int mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0, char cmd1, void (*fxn)(int), char *rbuf, int len); int mdss_dsi_panel_init(struct device_node *node, struct mdss_dsi_ctrl_pdata *ctrl_pdata, diff --git a/drivers/video/fbdev/msm/mdss_dsi_panel.c b/drivers/video/fbdev/msm/mdss_dsi_panel.c index 930a5378009a..5ba2b4729d64 100644 --- a/drivers/video/fbdev/msm/mdss_dsi_panel.c +++ b/drivers/video/fbdev/msm/mdss_dsi_panel.c @@ -132,7 +132,7 @@ static struct dsi_cmd_desc dcs_read_cmd = { dcs_cmd }; -u32 mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0, +int mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0, char cmd1, void (*fxn)(int), char *rbuf, int len) { struct dcs_cmd_req cmdreq; @@ -153,12 +153,11 @@ u32 mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0, cmdreq.rlen = len; cmdreq.rbuf = rbuf; cmdreq.cb = fxn; /* call back */ - mdss_dsi_cmdlist_put(ctrl, &cmdreq); /* * blocked here, until call back called */ - return 0; + return mdss_dsi_cmdlist_put(ctrl, &cmdreq); } static void mdss_dsi_panel_cmds_send(struct mdss_dsi_ctrl_pdata *ctrl,