From a23387f38db2bbfcdeb9b107c39b2311d4b25a54 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Mon, 26 Jul 2021 07:01:56 +0000 Subject: [PATCH] disp: msm: dsi: fix function type for dsi_display_clk_ctrl dsi_display_clk_ctrl is assigned as a callback function to struct sde_connector_ops::clk_ctrl. This changes changes the function type to match the pointer type to avoid Control-Flow Integrity (CFI) failures. Bug: 148470764 Change-Id: Id67a6971a597b047524cf6eac6c48c057e8f9e9a Signed-off-by: Sami Tolvanen --- techpack/display/msm/dsi/dsi_clk.h | 3 +-- techpack/display/msm/dsi/dsi_clk_manager.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/techpack/display/msm/dsi/dsi_clk.h b/techpack/display/msm/dsi/dsi_clk.h index fcd352d19b7b..ccc1ba7dfcc2 100644 --- a/techpack/display/msm/dsi/dsi_clk.h +++ b/techpack/display/msm/dsi/dsi_clk.h @@ -268,8 +268,7 @@ int dsi_display_link_clk_force_update_ctrl(void *handle); * * return: error code in case of failure or 0 for success. */ -int dsi_display_clk_ctrl(void *handle, - enum dsi_clk_type clk_type, enum dsi_clk_state clk_state); +int dsi_display_clk_ctrl(void *handle, u32 clk_type, u32 clk_state); /** * dsi_clk_set_link_frequencies() - set frequencies for link clks diff --git a/techpack/display/msm/dsi/dsi_clk_manager.c b/techpack/display/msm/dsi/dsi_clk_manager.c index ec2df96605a9..7983ff027541 100644 --- a/techpack/display/msm/dsi/dsi_clk_manager.c +++ b/techpack/display/msm/dsi/dsi_clk_manager.c @@ -1291,8 +1291,7 @@ int dsi_display_link_clk_force_update_ctrl(void *handle) return rc; } -int dsi_display_clk_ctrl(void *handle, - enum dsi_clk_type clk_type, enum dsi_clk_state clk_state) +int dsi_display_clk_ctrl(void *handle, u32 clk_type, u32 clk_state) { int rc = 0;