Merge "sound: usb: Fix check with usb_get_controller_id() for valid controller id" (015c9429) · Commits · e / devices / android_kernel_fairphone_FP5

sound/usb/usb_audio_qmi_svc.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -662,13 +662,11 @@ static int prepare_qmi_response(struct snd_usb_substream *subs,
		skip_sync_ep:
		resp->interrupter_num = uaudio_qdev->intr_num;
		resp->interrupter_num_valid = 1;

		resp->controller_num_valid = 0;
		ret = usb_get_controller_id(subs->dev);
		if (!ret) {
		if (ret >= 0) {
		resp->controller_num = ret;
		resp->controller_num_valid = 1;
		} else {
		resp->controller_num_valid = 0;
		}

		/* map xhci data structures PA memory to iova */