Commit eab2b553 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai

sound: usb-audio: fix rules check for 32-channel devices

When storing the channel numbers used by a format, and if the device
happens to support 32 channels, the code would try to store 1<<32 in
a 32-bit value.

Since no valid format can have zero channels, we can use 1<<(channels-1)
instead of 1<<channels so that all the channel numbers that we test for
fit into 32 bits.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f3990e61
...@@ -1783,7 +1783,7 @@ static int check_hw_params_convention(struct snd_usb_substream *subs) ...@@ -1783,7 +1783,7 @@ static int check_hw_params_convention(struct snd_usb_substream *subs)
if (rates[f->format] && rates[f->format] != f->rates) if (rates[f->format] && rates[f->format] != f->rates)
goto __out; goto __out;
} }
channels[f->format] |= (1 << f->channels); channels[f->format] |= 1 << (f->channels - 1);
rates[f->format] |= f->rates; rates[f->format] |= f->rates;
/* needs knot? */ /* needs knot? */
if (f->rates & SNDRV_PCM_RATE_KNOT) if (f->rates & SNDRV_PCM_RATE_KNOT)
...@@ -1810,7 +1810,7 @@ static int check_hw_params_convention(struct snd_usb_substream *subs) ...@@ -1810,7 +1810,7 @@ static int check_hw_params_convention(struct snd_usb_substream *subs)
continue; continue;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
if (f->rates & (1 << i)) if (f->rates & (1 << i))
channels[i] |= (1 << f->channels); channels[i] |= 1 << (f->channels - 1);
} }
} }
cmaster = 0; cmaster = 0;
......
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