Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating dwc_otg driver to fix issue releasing pcm stream see: https://g... #44

Merged
merged 1 commit into from
Jul 9, 2012
Merged

Updating dwc_otg driver to fix issue releasing pcm stream see: https://g... #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
#include "dwc_otg_hcd_if.h"
#include "dwc_otg_dbg.h"
#include "dwc_otg_driver.h"
#include "dwc_otg_hcd.h"

/**
* Gets the endpoint number from a _bEndpointAddress argument. The endpoint is
Expand Down Expand Up @@ -267,6 +268,7 @@ extern unsigned int g_dwc_otg_interrupt_counts[10];
static int _complete(dwc_otg_hcd_t * hcd, void *urb_handle,
dwc_otg_hcd_urb_t * dwc_otg_urb, int32_t status)
{
uint64_t flags;
struct urb *urb = (struct urb *)urb_handle;

#ifdef DEBUG_SOF_FIX
Expand Down Expand Up @@ -356,7 +358,9 @@ static int _complete(dwc_otg_hcd_t * hcd, void *urb_handle,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30))
usb_hcd_giveback_urb(dwc_otg_hcd_to_hcd(hcd), urb);
#else
DWC_SPINLOCK_IRQSAVE(hcd->lock, &flags);
usb_hcd_unlink_urb_from_ep(dwc_otg_hcd_to_hcd(hcd), urb);
DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags);
usb_hcd_giveback_urb(dwc_otg_hcd_to_hcd(hcd), urb, status);
#endif
return 0;
Expand Down Expand Up @@ -767,6 +771,8 @@ static int urb_dequeue(struct usb_hcd *hcd, struct urb *urb)
static int urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
#endif
{
int rc;
uint64_t flags;
dwc_otg_hcd_t *dwc_otg_hcd;
DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD URB Dequeue\n");

Expand All @@ -788,8 +794,18 @@ static int urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30))
usb_hcd_giveback_urb(hcd, urb);
#else
usb_hcd_unlink_urb_from_ep(hcd, urb);
usb_hcd_giveback_urb(hcd, urb, status);
DWC_SPINLOCK_IRQSAVE(dwc_otg_hcd->lock, &flags);
rc = usb_hcd_check_unlink_urb(hcd, urb, status);
if(!rc)
{
usb_hcd_unlink_urb_from_ep(hcd, urb);
}

DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock, flags);
if (!rc)
{
usb_hcd_giveback_urb(hcd, urb, status);
}
#endif
if (CHK_DEBUG_LEVEL(DBG_HCDV | DBG_HCD_URB)) {
DWC_PRINTF("Called usb_hcd_giveback_urb()\n");
Expand Down