ALSA: usb-audio: use a format bitmask per alternate setting

In preparation for USB audio 2.0 support, change the audioformat
structure so that it uses a bitmask to specify possible formats.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 3f53dee1270f..d65235c0106a 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -94,7 +94,7 @@ int snd_usb_add_audio_endpoint(struct snd_usb_audio *chip, int stream, struct au
                 if (subs->endpoint == fp->endpoint) {
                         list_add_tail(&fp->list, &subs->fmt_list);
                         subs->num_formats++;
-                        subs->formats |= 1ULL << fp->format;
+                        subs->formats |= fp->formats;
                         return 0;
                 }
         }
@@ -268,7 +268,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
                  */
                 if (fmt[4] == 1 && fmt[5] == 2 && altno == 2 && num == 3 &&
                     fp && fp->altsetting == 1 && fp->channels == 1 &&
-                    fp->format == SNDRV_PCM_FORMAT_S16_LE &&
+                    fp->formats == SNDRV_PCM_FMTBIT_S16_LE &&
                     protocol == UAC_VERSION_1 &&
                     le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize) ==
                                                         fp->maxpacksize * 2)