Commit 8ad10dc6 authored by Sachin Kamat's avatar Sachin Kamat Committed by Takashi Iwai

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: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 27b2a22c
...@@ -155,7 +155,7 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof ...@@ -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)) { if (fmt[0] < offset + 1 + 3 * (nr_rates ? nr_rates : 2)) {
snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n", snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n",
chip->dev->devnum, fp->iface, fp->altsetting); 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 ...@@ -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); fp->rate_table = kmalloc(sizeof(int) * nr_rates, GFP_KERNEL);
if (fp->rate_table == NULL) { if (fp->rate_table == NULL) {
snd_printk(KERN_ERR "cannot malloc\n"); 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 ...@@ -198,7 +198,7 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof
} }
if (!fp->nr_rates) { if (!fp->nr_rates) {
hwc_debug("All rates were zero. Skipping format!\n"); hwc_debug("All rates were zero. Skipping format!\n");
return -1; return -EINVAL;
} }
} else { } else {
/* continuous rates */ /* continuous rates */
...@@ -383,7 +383,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip, ...@@ -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, fp->formats = parse_audio_format_i_type(chip, fp, format,
fmt, protocol); fmt, protocol);
if (!fp->formats) 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, ...@@ -409,7 +409,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,
if (fp->channels < 1) { if (fp->channels < 1) {
snd_printk(KERN_ERR "%d:%u:%d : invalid channels %d\n", snd_printk(KERN_ERR "%d:%u:%d : invalid channels %d\n",
chip->dev->devnum, fp->iface, fp->altsetting, fp->channels); chip->dev->devnum, fp->iface, fp->altsetting, fp->channels);
return -1; return -EINVAL;
} }
return ret; return ret;
......
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