Commit 960a581e authored by Libin Yang's avatar Libin Yang Committed by Takashi Iwai

ALSA: hda: fix some klockwork scan warnings

This patch fixes some warnings from klockwork.

These warnings are not the real issues. The patch
adds the sanity check.
Signed-off-by: default avatarLibin Yang <libin.yang@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 76f64b24
...@@ -353,7 +353,8 @@ static void hdmi_std_setup_channel_mapping(struct hdac_chmap *chmap, ...@@ -353,7 +353,8 @@ static void hdmi_std_setup_channel_mapping(struct hdac_chmap *chmap,
int hdmi_slot = 0; int hdmi_slot = 0;
/* fill actual channel mappings in ALSA channel (i) order */ /* fill actual channel mappings in ALSA channel (i) order */
for (i = 0; i < ch_alloc->channels; i++) { for (i = 0; i < ch_alloc->channels; i++) {
while (!ch_alloc->speakers[7 - hdmi_slot] && !WARN_ON(hdmi_slot >= 8)) while (!WARN_ON(hdmi_slot >= 8) &&
!ch_alloc->speakers[7 - hdmi_slot])
hdmi_slot++; /* skip zero slots */ hdmi_slot++; /* skip zero slots */
hdmi_channel_mapping[ca][i] = (i << 4) | hdmi_slot++; hdmi_channel_mapping[ca][i] = (i << 4) | hdmi_slot++;
...@@ -430,6 +431,12 @@ static int to_cea_slot(int ordered_ca, unsigned char pos) ...@@ -430,6 +431,12 @@ static int to_cea_slot(int ordered_ca, unsigned char pos)
int mask = snd_hdac_chmap_to_spk_mask(pos); int mask = snd_hdac_chmap_to_spk_mask(pos);
int i; int i;
/* Add sanity check to pass klockwork check.
* This should never happen.
*/
if (ordered_ca >= ARRAY_SIZE(channel_allocations))
return -1;
if (mask) { if (mask) {
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (channel_allocations[ordered_ca].speakers[7 - i] == mask) if (channel_allocations[ordered_ca].speakers[7 - i] == mask)
...@@ -456,7 +463,15 @@ EXPORT_SYMBOL_GPL(snd_hdac_spk_to_chmap); ...@@ -456,7 +463,15 @@ EXPORT_SYMBOL_GPL(snd_hdac_spk_to_chmap);
/* from CEA slot to ALSA API channel position */ /* from CEA slot to ALSA API channel position */
static int from_cea_slot(int ordered_ca, unsigned char slot) static int from_cea_slot(int ordered_ca, unsigned char slot)
{ {
int mask = channel_allocations[ordered_ca].speakers[7 - slot]; int mask;
/* Add sanity check to pass klockwork check.
* This should never happen.
*/
if (slot >= 8)
return 0;
mask = channel_allocations[ordered_ca].speakers[7 - slot];
return snd_hdac_spk_to_chmap(mask); return snd_hdac_spk_to_chmap(mask);
} }
...@@ -523,7 +538,8 @@ static void hdmi_setup_fake_chmap(unsigned char *map, int ca) ...@@ -523,7 +538,8 @@ static void hdmi_setup_fake_chmap(unsigned char *map, int ca)
int ordered_ca = get_channel_allocation_order(ca); int ordered_ca = get_channel_allocation_order(ca);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (i < channel_allocations[ordered_ca].channels) if (ordered_ca < ARRAY_SIZE(channel_allocations) &&
i < channel_allocations[ordered_ca].channels)
map[i] = from_cea_slot(ordered_ca, hdmi_channel_mapping[ca][i] & 0x0f); map[i] = from_cea_slot(ordered_ca, hdmi_channel_mapping[ca][i] & 0x0f);
else else
map[i] = 0; map[i] = 0;
...@@ -551,6 +567,12 @@ int snd_hdac_get_active_channels(int ca) ...@@ -551,6 +567,12 @@ int snd_hdac_get_active_channels(int ca)
{ {
int ordered_ca = get_channel_allocation_order(ca); int ordered_ca = get_channel_allocation_order(ca);
/* Add sanity check to pass klockwork check.
* This should never happen.
*/
if (ordered_ca >= ARRAY_SIZE(channel_allocations))
ordered_ca = 0;
return channel_allocations[ordered_ca].channels; return channel_allocations[ordered_ca].channels;
} }
EXPORT_SYMBOL_GPL(snd_hdac_get_active_channels); EXPORT_SYMBOL_GPL(snd_hdac_get_active_channels);
......
...@@ -3584,6 +3584,12 @@ static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid, ...@@ -3584,6 +3584,12 @@ static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid,
bool reset; bool reset;
spdif = snd_hda_spdif_out_of_nid(codec, nid); spdif = snd_hda_spdif_out_of_nid(codec, nid);
/* Add sanity check to pass klockwork check.
* This should never happen.
*/
if (WARN_ON(spdif == NULL))
return;
curr_fmt = snd_hda_codec_read(codec, nid, 0, curr_fmt = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_STREAM_FORMAT, 0); AC_VERB_GET_STREAM_FORMAT, 0);
reset = codec->spdif_status_reset && reset = codec->spdif_status_reset &&
...@@ -3768,7 +3774,7 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, ...@@ -3768,7 +3774,7 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
spdif = snd_hda_spdif_out_of_nid(codec, mout->dig_out_nid); spdif = snd_hda_spdif_out_of_nid(codec, mout->dig_out_nid);
if (mout->dig_out_nid && mout->share_spdif && if (mout->dig_out_nid && mout->share_spdif &&
mout->dig_out_used != HDA_DIG_EXCLUSIVE) { mout->dig_out_used != HDA_DIG_EXCLUSIVE) {
if (chs == 2 && if (chs == 2 && spdif != NULL &&
snd_hda_is_supported_format(codec, mout->dig_out_nid, snd_hda_is_supported_format(codec, mout->dig_out_nid,
format) && format) &&
!(spdif->status & IEC958_AES0_NONAUDIO)) { !(spdif->status & IEC958_AES0_NONAUDIO)) {
......
...@@ -1680,6 +1680,11 @@ static bool check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) ...@@ -1680,6 +1680,11 @@ static bool check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
mutex_lock(&codec->spdif_mutex); mutex_lock(&codec->spdif_mutex);
spdif = snd_hda_spdif_out_of_nid(codec, cvt_nid); spdif = snd_hda_spdif_out_of_nid(codec, cvt_nid);
/* Add sanity check to pass klockwork check.
* This should never happen.
*/
if (WARN_ON(spdif == NULL))
return true;
non_pcm = !!(spdif->status & IEC958_AES0_NONAUDIO); non_pcm = !!(spdif->status & IEC958_AES0_NONAUDIO);
mutex_unlock(&codec->spdif_mutex); mutex_unlock(&codec->spdif_mutex);
return non_pcm; return non_pcm;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment