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>

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_audio.c b/drivers/gpu/drm/msm/hdmi/hdmi_audio.c
index 8177e8511afd8c6827b1a731688e159da652a8d2..9c34b91ae329074d2d108b30fcaa3914d7e37477 100644 (file)
--- 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)
                /* configure infoframe: */
                hdmi_audio_infoframe_pack(info, buf, sizeof(buf));
                hdmi_write(hdmi, REG_HDMI_AUDIO_INFO0,
-                               (buf[3] <<  0) || (buf[4] <<  8) ||
-                               (buf[5] << 16) || (buf[6] << 24));
+                               (buf[3] <<  0) | (buf[4] <<  8) |
+                               (buf[5] << 16) | (buf[6] << 24));
                hdmi_write(hdmi, REG_HDMI_AUDIO_INFO1,
-                               (buf[7] <<  0) || (buf[8] << 8));
+                               (buf[7] <<  0) | (buf[8] << 8));
 
                hdmi_write(hdmi, REG_HDMI_GC, 0);