diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-15 05:42:52 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-15 05:42:51 -0700 |
| commit | 58b0d29d48664884ab346b951a4abb8dc0e7e5a1 (patch) | |
| tree | 87ae4cf1cc6d92546b9c5a53900ffd12df7c20f0 /drivers/gpu/drm | |
| parent | b542fae9eadc36e7fdd4ea8a538fc8781cad4caf (diff) | |
| parent | 0932f23cdb7f8e4c67846894e4ac551decb4badc (diff) | |
Merge "drm: msm: dsi: fix local variable not initialized issue"
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/dsi-staging/dsi_ctrl_hw_1_4.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/dsi-staging/dsi_display.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c b/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c index fb9617ce572a..6015cf35e030 100644 --- a/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c +++ b/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1089,7 +1089,7 @@ error: static int dsi_enable_ulps(struct dsi_ctrl *dsi_ctrl) { int rc = 0; - u32 lanes; + u32 lanes = 0; u32 ulps_lanes; if (dsi_ctrl->host_config.panel_mode == DSI_OP_CMD_MODE) diff --git a/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl_hw_1_4.c b/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl_hw_1_4.c index 2f0f6c2f1b01..caba50832cca 100644 --- a/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl_hw_1_4.c +++ b/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl_hw_1_4.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -565,7 +565,7 @@ u32 dsi_ctrl_hw_14_get_cmd_read_data(struct dsi_ctrl_hw *ctrl, u32 read_cnt; u32 rx_byte = 0; u32 repeated_bytes = 0; - u8 reg[16]; + u8 reg[16] = {0}; u32 pkt_size = 0; int buf_offset = read_offset; diff --git a/drivers/gpu/drm/msm/dsi-staging/dsi_display.c b/drivers/gpu/drm/msm/dsi-staging/dsi_display.c index f2412daee8b6..09ab14cc4746 100644 --- a/drivers/gpu/drm/msm/dsi-staging/dsi_display.c +++ b/drivers/gpu/drm/msm/dsi-staging/dsi_display.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1481,8 +1481,8 @@ static int dsi_display_dfps_update(struct dsi_display *display, m_ctrl = &display->ctrl[display->clk_master_idx]; rc = dsi_ctrl_async_timing_update(m_ctrl->ctrl, timing); if (rc) { - pr_err("[%s] failed to dfps update host_%d, rc=%d\n", - display->name, i, rc); + pr_err("[%s] failed to dfps update clock master, rc=%d\n", + display->name, rc); goto error; } |