evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "sound: usb: Add default branches for BADD 3.0 devices"

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-15 03:51:22 -07:00 • committed by Gerrit - the friendly Code Review server
commit 593bc3b721
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sound/usb/format.c
View file

@ -90,6 +90,11 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip,
sample_bytes = SUBSLOTSIZE_24_BIT;
break;
}
default:
usb_audio_err(chip, "%u:%d : Invalid wMaxPacketSize\n",
fp->iface, fp->altsetting);
return pcm_formats;
}
format = 1 << format;
break;

4
sound/usb/mixer.c
View file

@ -1632,6 +1632,10 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid,
break;
}
break;
default:
usb_audio_err(state->chip, "Invalid unit %u\n", unitid);
return -EINVAL;
}
}

6
sound/usb/usb_audio_qmi_svc.c
View file

@ -497,6 +497,12 @@ static int prepare_qmi_response(struct snd_usb_substream *subs,
resp->usb_audio_subslot_size = SUBSLOTSIZE_24_BIT;
break;
}
default:
pr_err("%d: %u: Invalid wMaxPacketSize\n",
subs->interface, subs->altset_idx);
ret = -EINVAL;
goto err;
}
resp->usb_audio_subslot_size_valid = 1;
} else {