Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20bd5505 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sound: usb: Handle implicit feedback data endpoint properly" into msm-4.9

parents 4e13e5a8 44cefc58

sound/usb/usb_audio_qmi_svc.c

+3 −3
Original line number Diff line number Diff line
@@ -494,9 +494,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;
@@ -510,6 +509,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;