ALSA: usb-audio: Return meaningful error codes instead of -1 in format.c

Also, silences the following smatch warning:
sound/usb/format.c:170 parse_audio_format_rates_v1() warn:
returning -1 instead of -ENOMEM is sloppy

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/format.c b/sound/usb/format.c
index ddfef57..e831ee4 100644 (file)
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -155,7 +155,7 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof
        if (fmt[0] < offset + 1 + 3 * (nr_rates ? nr_rates : 2)) {
                snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n",
                                   chip->dev->devnum, fp->iface, fp->altsetting);
        if (fmt[0] < offset + 1 + 3 * (nr_rates ? nr_rates : 2)) {
                snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n",
                                   chip->dev->devnum, fp->iface, fp->altsetting);

-               return -1;
+               return -EINVAL;

        }
 
        if (nr_rates) {
        }
 
        if (nr_rates) {


@@ -167,7 +167,7 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof
                fp->rate_table = kmalloc(sizeof(int) * nr_rates, GFP_KERNEL);
                if (fp->rate_table == NULL) {
                        snd_printk(KERN_ERR "cannot malloc\n");
                fp->rate_table = kmalloc(sizeof(int) * nr_rates, GFP_KERNEL);
                if (fp->rate_table == NULL) {
                        snd_printk(KERN_ERR "cannot malloc\n");

-                       return -1;
+                       return -ENOMEM;

                }
 
                fp->nr_rates = 0;
                }
 
                fp->nr_rates = 0;


@@ -198,7 +198,7 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof
                }
                if (!fp->nr_rates) {
                        hwc_debug("All rates were zero. Skipping format!\n");
                }
                if (!fp->nr_rates) {
                        hwc_debug("All rates were zero. Skipping format!\n");

-                       return -1;
+                       return -EINVAL;

                }
        } else {
                /* continuous rates */
                }
        } else {
                /* continuous rates */


@@ -383,7 +383,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,
                fp->formats = parse_audio_format_i_type(chip, fp, format,
                                                        fmt, protocol);
                if (!fp->formats)
                fp->formats = parse_audio_format_i_type(chip, fp, format,
                                                        fmt, protocol);
                if (!fp->formats)

-                       return -1;
+                       return -EINVAL;

        }
 
        /* gather possible sample rates */
        }
 
        /* gather possible sample rates */


@@ -409,7 +409,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,
        if (fp->channels < 1) {
                snd_printk(KERN_ERR "%d:%u:%d : invalid channels %d\n",
                           chip->dev->devnum, fp->iface, fp->altsetting, fp->channels);
        if (fp->channels < 1) {
                snd_printk(KERN_ERR "%d:%u:%d : invalid channels %d\n",
                           chip->dev->devnum, fp->iface, fp->altsetting, fp->channels);

-               return -1;
+               return -EINVAL;

        }
 
        return ret;
        }
 
        return ret;