Unverified Commit 9e57bb44 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8800 ALSA: usb-audio: Stop parsing channels bits when all channels are found. 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuan Can <yuancan@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FXTDKO4JP4ZJDRZ4UVNQEQC2X3QDAREK/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q91N 
 
Link:https://gitee.com/openeuler/kernel/pulls/8800

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents aaad95d4 24617d0f

sound/usb/stream.c

+4 −1
Original line number Diff line number Diff line
@@ -305,9 +305,12 @@ static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits, 
	c = 0;



	if (bits) {

		for (; bits && *maps; maps++, bits >>= 1)

		for (; bits && *maps; maps++, bits >>= 1) {

			if (bits & 1)

				chmap->map[c++] = *maps;

			if (c == chmap->channels)

				break;

		}

	} else {

		/* If we're missing wChannelConfig, then guess something

		    to make sure the channel map is not skipped entirely */