Merge pull request #89 from ddv2005/rpi-3.2.27

popcornmix · popcornmix · commit f7da120ddb1d · 2012-08-20T08:14:42.000-07:00
Revert "Disable IRQs in dwc_otg_hcd_qh_free" patch
diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
@@ -54,11 +54,10 @@ extern bool microframe_schedule;
  */
 void dwc_otg_hcd_qh_free(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
 {
-	dwc_irqflags_t flags;
 	dwc_otg_qtd_t *qtd, *qtd_tmp;
 
 	/* Free each QTD in the QTD list */
-	DWC_SPINLOCK_IRQSAVE(hcd->lock,&flags);
+	DWC_SPINLOCK(hcd->lock);
 	DWC_CIRCLEQ_FOREACH_SAFE(qtd, qtd_tmp, &qh->qtd_list, qtd_list_entry) {
 		DWC_CIRCLEQ_REMOVE(&qh->qtd_list, qtd, qtd_list_entry);
 		dwc_otg_hcd_qtd_free(qtd);
@@ -77,7 +76,7 @@ void dwc_otg_hcd_qh_free(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
 	}
 
 	DWC_FREE(qh);
-	DWC_SPINUNLOCK_IRQRESTORE(hcd->lock,flags);
+	DWC_SPINUNLOCK(hcd->lock);
 	return;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,10 @@ extern bool microframe_schedule;`
`54`	`54`	`*/`
`55`	`55`	`void dwc_otg_hcd_qh_free(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)`
`56`	`56`	`{`
`57`		`- dwc_irqflags_t flags;`
`58`	`57`	`dwc_otg_qtd_t qtd, qtd_tmp;`
`59`	`58`
`60`	`59`	`/* Free each QTD in the QTD list */`
`61`		`- DWC_SPINLOCK_IRQSAVE(hcd->lock,&flags);`
	`60`	`+ DWC_SPINLOCK(hcd->lock);`
`62`	`61`	`DWC_CIRCLEQ_FOREACH_SAFE(qtd, qtd_tmp, &qh->qtd_list, qtd_list_entry) {`
`63`	`62`	`DWC_CIRCLEQ_REMOVE(&qh->qtd_list, qtd, qtd_list_entry);`
`64`	`63`	`dwc_otg_hcd_qtd_free(qtd);`
`@@ -77,7 +76,7 @@ void dwc_otg_hcd_qh_free(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)`
`77`	`76`	`}`
`78`	`77`
`79`	`78`	`DWC_FREE(qh);`
`80`		`- DWC_SPINUNLOCK_IRQRESTORE(hcd->lock,flags);`
	`79`	`+ DWC_SPINUNLOCK(hcd->lock);`
`81`	`80`	`return;`
`82`	`81`	`}`
`83`	`82`