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

Commit 06d5ffb0 authored by Mayank Rana's avatar Mayank Rana
Browse files

sound: usb: Unmap secondary event ring before freeing 



USB secondary event ring is being freed before it is being unmap.
Fix this by calling xhci_sec_event_ring_cleanup() after unmapping.
Also move secondary event ring cleanup and unmap related duplicate
code into one API.

Change-Id: I420f53d9e3ad6aa7b310dc354c7d35ce139afbe9
Signed-off-by: default avatarMayank Rana <mrana@codeaurora.org>
parent 33569a19

sound/usb/usb_audio_qmi_svc.c

+14 −22
Original line number Diff line number Diff line
@@ -856,6 +856,18 @@ static void uaudio_dev_intf_cleanup(struct usb_device *udev, 
	info->in_use = false;

}



static void uaudio_event_ring_cleanup_free(struct uaudio_dev *dev)

{

	clear_bit(dev->card_num, &uaudio_qdev->card_slot);

	/* all audio devices are disconnected */

	if (!uaudio_qdev->card_slot) {

		uaudio_iommu_unmap(MEM_EVENT_RING, IOVA_BASE, PAGE_SIZE,

			PAGE_SIZE);

		xhci_sec_event_ring_cleanup(dev->udev, uaudio_qdev->intr_num);

		uaudio_dbg("all audio devices disconnected\n");

	}

}



static void uaudio_dev_cleanup(struct uaudio_dev *dev)

{

	int if_idx;
@@ -879,17 +891,7 @@ static void uaudio_dev_cleanup(struct uaudio_dev *dev) 
	/* free interface info */

	kfree(dev->info);

	dev->info = NULL;



	clear_bit(dev->card_num, &uaudio_qdev->card_slot);



	/* all audio devices are disconnected */

	if (!uaudio_qdev->card_slot) {

		uaudio_iommu_unmap(MEM_EVENT_RING, IOVA_BASE, PAGE_SIZE,

			PAGE_SIZE);

		xhci_sec_event_ring_cleanup(dev->udev, uaudio_qdev->intr_num);

		uaudio_dbg("all audio devices disconnected\n");

	}



	uaudio_event_ring_cleanup_free(dev);

	dev->udev = NULL;

}
@@ -961,17 +963,7 @@ static void uaudio_dev_release(struct kref *kref) 
	uaudio_dbg("for dev %pK\n", dev);



	atomic_set(&dev->in_use, 0);



	clear_bit(dev->card_num, &uaudio_qdev->card_slot);



	/* all audio devices are disconnected */

	if (!uaudio_qdev->card_slot) {

		xhci_sec_event_ring_cleanup(dev->udev, uaudio_qdev->intr_num);

		uaudio_iommu_unmap(MEM_EVENT_RING, IOVA_BASE, PAGE_SIZE,

			PAGE_SIZE);

		uaudio_dbg("all audio devices disconnected\n");

	}



	uaudio_event_ring_cleanup_free(dev);

	wake_up(&dev->disconnect_wq);

}