diff options
| author | Ajay Agarwal <ajaya@codeaurora.org> | 2019-01-08 19:26:46 +0530 |
|---|---|---|
| committer | Ajay Agarwal <ajaya@codeaurora.org> | 2019-01-09 10:16:51 +0530 |
| commit | 05dd6da5f6f1d57aae14d4b865d80e4ec7814175 (patch) | |
| tree | 5e3b3342104b09b54c46a0cd3c5914e878f7dc14 | |
| parent | 2b19cf4fb888bf9ba549251c746d3fb61a09b794 (diff) | |
Revert "usb: gadget: u_audio: update hw_ptr in iso_complete after data copied"
This reverts commit 06e25fbb83b34f3ca4db69d7ebf7ce1d8f4da65b.
Required for clean picking of UAC opensource changes.
Change-Id: I9090ca1d75f0521f799f6849b3720909f987bbdc
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
| -rw-r--r-- | drivers/usb/gadget/function/u_audio.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c index 725593f7da9b..429d7928b7c9 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -152,6 +152,7 @@ static void u_audio_iso_complete(struct usb_ep *ep, struct usb_request *req) update_alsa = true; hw_ptr = prm->hw_ptr; + prm->hw_ptr = (prm->hw_ptr + req->actual) % prm->dma_bytes; spin_unlock_irqrestore(&prm->lock, flags); @@ -176,11 +177,6 @@ static void u_audio_iso_complete(struct usb_ep *ep, struct usb_request *req) } } - spin_lock_irqsave(&prm->lock, flags); - /* update hw_ptr after data is copied to memory */ - prm->hw_ptr = (hw_ptr + req->actual) % prm->dma_bytes; - spin_unlock_irqrestore(&prm->lock, flags); - exit: if (usb_ep_queue(ep, req, GFP_ATOMIC)) dev_err(uac->card->dev, "%d Error!\n", __LINE__); |