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

Merge "sound: usb: Handle implicit feedback data endpoint properly"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-10 23:06:35 -08:00 • committed by Gerrit - the friendly Code Review server
commit cbd1483f05
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/usb/usb_audio_qmi_svc.c
View file

@ -495,9 +495,8 @@ static int prepare_qmi_response(struct snd_usb_substream *subs,
if (subs->sync_endpoint) {
ep = usb_pipe_endpoint(subs->dev, subs->sync_endpoint->pipe);
if (!ep) {
pr_err("%s: sync ep # %d context is null\n", __func__,
subs->sync_endpoint->ep_num);
goto err;
pr_debug("%s: implicit fb on data ep\n", __func__);
goto skip_sync_ep;
}
memcpy(&resp->std_as_sync_ep_desc, &ep->desc, sizeof(ep->desc));
resp->std_as_sync_ep_desc_valid = 1;
@ -511,6 +510,7 @@ static int prepare_qmi_response(struct snd_usb_substream *subs,
resp->xhci_mem_info.tr_sync.pa = xhci_pa;
}
skip_sync_ep:
resp->interrupter_num = uaudio_qdev->intr_num;
resp->interrupter_num_valid = 1;