Merge "usb: dwc3: Change dwc3 irq to oneshot threaded irq"

This commit is contained in:
Linux Build Service Account 2016-07-13 15:45:16 -07:00 committed by Gerrit - the friendly Code Review server
commit 32e8a524a8
2 changed files with 4 additions and 4 deletions

View file

@ -1021,8 +1021,8 @@ static int dwc3_probe(struct platform_device *pdev)
/* will be enabled in dwc3_msm_resume() */ /* will be enabled in dwc3_msm_resume() */
irq_set_status_flags(irq, IRQ_NOAUTOEN); irq_set_status_flags(irq, IRQ_NOAUTOEN);
ret = devm_request_irq(dev, irq, dwc3_interrupt, IRQF_SHARED, "dwc3", ret = devm_request_threaded_irq(dev, irq, NULL, dwc3_interrupt,
dwc); IRQF_SHARED | IRQF_ONESHOT, "dwc3", dwc);
if (ret) { if (ret) {
dev_err(dwc->dev, "failed to request irq #%d --> %d\n", dev_err(dwc->dev, "failed to request irq #%d --> %d\n",
irq, ret); irq, ret);

View file

@ -237,11 +237,11 @@ static int xhci_plat_probe(struct platform_device *pdev)
goto put_usb3_hcd; goto put_usb3_hcd;
} }
ret = usb_add_hcd(hcd, irq, IRQF_SHARED); ret = usb_add_hcd(hcd, irq, IRQF_SHARED | IRQF_ONESHOT);
if (ret) if (ret)
goto disable_usb_phy; goto disable_usb_phy;
ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED); ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED | IRQF_ONESHOT);
if (ret) if (ret)
goto dealloc_usb2_hcd; goto dealloc_usb2_hcd;