Merge "sound: usb: Fix error handling path" (5756e322) · Commits · e / devices / android_kernel_fairphone_FP5

sound/usb/usb_audio_qmi_svc.c

+17 −9

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#define BUS_INTERVAL_FULL_SPEED 1000 /* in us */
		#define BUS_INTERVAL_HIGHSPEED_AND_ABOVE 125 /* in us */
		#define MAX_BINTERVAL_ISOC_EP 16
		#define DEV_RELEASE_WAIT_TIMEOUT 10000 /* in ms */

		#define SND_PCM_CARD_NUM_MASK 0xffff0000
		#define SND_PCM_DEV_NUM_MASK 0xff00
		@@ -929,12 +930,17 @@ static void uaudio_disconnect_cb(struct snd_usb_audio *chip)
		if (ret < 0)
		uaudio_err("qmi send failed with err: %d\n", ret);

		ret = wait_event_interruptible(dev->disconnect_wq,
		!atomic_read(&dev->in_use));
		if (ret < 0) {
		uaudio_dbg("failed with ret %d\n", ret);
		return;
		ret = wait_event_interruptible_timeout(dev->disconnect_wq,
		!atomic_read(&dev->in_use),
		msecs_to_jiffies(DEV_RELEASE_WAIT_TIMEOUT));
		if (!ret) {
		uaudio_err("timeout while waiting for dev_release\n");
		atomic_set(&dev->in_use, 0);
		} else if (ret < 0) {
		uaudio_err("failed with ret %d\n", ret);
		atomic_set(&dev->in_use, 0);
		}

		mutex_lock(&chip->dev_lock);
		}

		@@ -1198,18 +1204,20 @@ static void handle_uaudio_stream_req(struct qmi_handle *handle,
		mutex_unlock(&chip->dev_lock);

		response:
		if (!req_msg->enable && ret != -EINVAL) {
		if (info_idx >= 0) {
		if (!req_msg->enable && ret != -EINVAL && ret != -ENODEV) {
		mutex_lock(&chip->dev_lock);
		if (info_idx >= 0) {
		info = &uadev[pcm_card_num].info[info_idx];
		uaudio_dev_intf_cleanup(uadev[pcm_card_num].udev, info);
		uaudio_dev_intf_cleanup(
		uadev[pcm_card_num].udev,
		info);
		uaudio_dbg("release resources: intf# %d card# %d\n",
		subs->interface, pcm_card_num);
		mutex_unlock(&chip->dev_lock);
		}
		if (atomic_read(&uadev[pcm_card_num].in_use))
		kref_put(&uadev[pcm_card_num].kref,
		uaudio_dev_release);
		mutex_unlock(&chip->dev_lock);
		}

		resp.usb_token = req_msg->usb_token;