ALSA: hda: fix possible null dereference
we are dereferencing pcm first then checking pcm. instead now lets put them in same if condition so that pcm is checked first. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Родитель
382fd7becc
Коммит
751e221689
|
@ -3230,9 +3230,8 @@ static int add_std_chmaps(struct hda_codec *codec)
|
|||
struct snd_pcm_chmap *chmap;
|
||||
const struct snd_pcm_chmap_elem *elem;
|
||||
|
||||
if (pcm->own_chmap)
|
||||
continue;
|
||||
if (!pcm || !hinfo->substreams)
|
||||
if (!pcm || pcm->own_chmap ||
|
||||
!hinfo->substreams)
|
||||
continue;
|
||||
elem = hinfo->chmap ? hinfo->chmap : snd_pcm_std_chmaps;
|
||||
err = snd_pcm_add_chmap_ctls(pcm->pcm, str, elem,
|
||||
|
|
Загрузка…
Ссылка в новой задаче