| author | Xiaoliang Wang <xiaoliang.wang@amlogic.com> | 2018-12-20 02:11:44 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-12-20 02:11:44 (GMT) |
| commit | bdbe75406cdaa878c6f8fb5b87b2e1071cc65205 (patch) | |
| tree | 62e2d169ea756ebcaa6467d38ef6375005ee1bf2 | |
| parent | aa9fc62ee9b94b0f2bd02da61da3c9b87e9b3ad5 (diff) | |
| parent | eabc547871f2184c37b51a772c0cfe6160178068 (diff) | |
| download | common-bdbe75406cdaa878c6f8fb5b87b2e1071cc65205.zip common-bdbe75406cdaa878c6f8fb5b87b2e1071cc65205.tar.gz common-bdbe75406cdaa878c6f8fb5b87b2e1071cc65205.tar.bz2 | |
Merge "hdmitx: fix KASAN Bug in hdmitx_set_audio [1/1]" into p-tv-atom
| -rw-r--r-- | drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_audio.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_audio.c index 1357960..e89f9db 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_audio.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_audio.c @@ -90,7 +90,7 @@ static void hdmi_tx_construct_aud_packet( channel_status_freq[audio_param->sample_rate]; CHAN_STAT_BUF[4] = CHAN_STAT_BUF[24+4] = channel_status_sample_word_length[ - audio_param->sample_size]| + audio_param->sample_size & 0x3]| ((~channel_status_freq[ audio_param->sample_rate])<<4); } |