aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiviu Dudau <Liviu.Dudau@arm.com>2017-06-15 10:13:46 -0400
committerRob Clark <robdclark@gmail.com>2017-06-16 11:16:08 -0400
commitffe8f53f9cc73fb25c8f78d4aed7ddf285503a60 (patch)
treed1597038f9a6cccb8aea5d735c2b93b3514a9765
parent52260ae4c461538a4f104d463a55dfc13c3d8543 (diff)
drm/msm/hdmi: Use bitwise operators when building register values
Commit c0c0d9eeeb8d ("drm/msm: hdmi audio support") uses logical OR operators to build up a value to be written in the REG_HDMI_AUDIO_INFO0 and REG_HDMI_AUDIO_INFO1 registers when it should have used bitwise operators. Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> Fixes: c0c0d9eeeb8d ("drm/msm: hdmi audio support") Signed-off-by: Rob Clark <robdclark@gmail.com>
-rw-r--r--drivers/gpu/drm/msm/hdmi/hdmi_audio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_audio.c b/drivers/gpu/drm/msm/hdmi/hdmi_audio.c
index 8177e8511afd..9c34b91ae329 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_audio.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_audio.c
@@ -175,10 +175,10 @@ int msm_hdmi_audio_update(struct hdmi *hdmi)
175 /* configure infoframe: */ 175 /* configure infoframe: */
176 hdmi_audio_infoframe_pack(info, buf, sizeof(buf)); 176 hdmi_audio_infoframe_pack(info, buf, sizeof(buf));
177 hdmi_write(hdmi, REG_HDMI_AUDIO_INFO0, 177 hdmi_write(hdmi, REG_HDMI_AUDIO_INFO0,
178 (buf[3] << 0) || (buf[4] << 8) || 178 (buf[3] << 0) | (buf[4] << 8) |
179 (buf[5] << 16) || (buf[6] << 24)); 179 (buf[5] << 16) | (buf[6] << 24));
180 hdmi_write(hdmi, REG_HDMI_AUDIO_INFO1, 180 hdmi_write(hdmi, REG_HDMI_AUDIO_INFO1,
181 (buf[7] << 0) || (buf[8] << 8)); 181 (buf[7] << 0) | (buf[8] << 8));
182 182
183 hdmi_write(hdmi, REG_HDMI_GC, 0); 183 hdmi_write(hdmi, REG_HDMI_GC, 0);
184 184