]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ALSA: usb-audio: fix return values
authorDaniel Mack <daniel@caiaq.de>
Wed, 26 May 2010 16:11:37 +0000 (18:11 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 27 May 2010 07:48:47 +0000 (09:48 +0200)
-1 is not a good return value as it means -EPERM, "not permitted".
Choose -ENOTSUPP instead, which is what the code really wants to tell
its callers.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/format.c

index caaa3ef9e622433c135f0657cc7390620299245b..fe29d61de19bc80bdc0dbdc2fe209fd3fd71b21e 100644 (file)
@@ -408,7 +408,7 @@ int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *f
                snd_printd(KERN_INFO "%d:%u:%d : format type %d is not supported yet\n",
                           chip->dev->devnum, fp->iface, fp->altsetting,
                           fmt->bFormatType);
-               return -1;
+               return -ENOTSUPP;
        }
        fp->fmt_type = fmt->bFormatType;
        if (err < 0)
@@ -424,7 +424,7 @@ int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *f
                if (fmt->bFormatType == UAC_FORMAT_TYPE_I &&
                    fp->rates != SNDRV_PCM_RATE_48000 &&
                    fp->rates != SNDRV_PCM_RATE_96000)
-                       return -1;
+                       return -ENOTSUPP;
        }
 #endif
        return 0;