1 files changed, 12 insertions, 8 deletions

diff --git a/sound/usb/format.c b/sound/usb/format.c
index e831ee4238bb..a695cafc0599 100644
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -43,11 +43,11 @@
  */
 static u64 parse_audio_format_i_type(struct snd_usb_audio *chip,
                                      struct audioformat *fp,
-                                     int format, void *_fmt,
+                                     unsigned int format, void *_fmt,
                                      int protocol)
 {
         int sample_width, sample_bytes;
-        u64 pcm_formats;
+        u64 pcm_formats = 0;
 
         switch (protocol) {
         case UAC_VERSION_1:
@@ -63,14 +63,17 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip,
                 struct uac_format_type_i_ext_descriptor *fmt = _fmt;
                 sample_width = fmt->bBitResolution;
                 sample_bytes = fmt->bSubslotSize;
+
+                if (format & UAC2_FORMAT_TYPE_I_RAW_DATA)
+                        pcm_formats |= SNDRV_PCM_FMTBIT_SPECIAL;
+
                 format <<= 1;
                 break;
         }
         }
 
-        pcm_formats = 0;
-
-        if (format == 0 || format == (1 << UAC_FORMAT_TYPE_I_UNDEFINED)) {
+        if ((pcm_formats == 0) &&
+            (format == 0 || format == (1 << UAC_FORMAT_TYPE_I_UNDEFINED))) {
                 /* some devices don't define this correctly... */
                 snd_printdd(KERN_INFO "%d:%u:%d : format type 0 is detected, processed as PCM\n",
                             chip->dev->devnum, fp->iface, fp->altsetting);
@@ -353,7 +356,7 @@ err:
  * parse the format type I and III descriptors
  */
 static int parse_audio_format_i(struct snd_usb_audio *chip,
-                                struct audioformat *fp, int format,
+                                struct audioformat *fp, unsigned int format,
                                 struct uac_format_type_i_continuous_descriptor *fmt,
                                 struct usb_host_interface *iface)
 {
@@ -473,8 +476,9 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip,
         return ret;
 }
 
-int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fp,
-                               int format, struct uac_format_type_i_continuous_descriptor *fmt,
+int snd_usb_parse_audio_format(struct snd_usb_audio *chip,
+                               struct audioformat *fp, unsigned int format,
+                               struct uac_format_type_i_continuous_descriptor *fmt,
                                int stream, struct usb_host_interface *iface)
 {
         int err;