Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 280944
b: refs/heads/master
c: 3b9783b
h: refs/heads/master
v: v3
  • Loading branch information
Sarah Sharp committed Dec 22, 2011
1 parent 11fdd82 commit 11795d8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2a9227a5eeaeb3f91e3a72ceea4fa59016ca5d20
refs/heads/master: 3b9783b277e66731891ab42eeaacebbdcdd6e629
8 changes: 4 additions & 4 deletions trunk/drivers/usb/host/xhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,14 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)

ret = pci_enable_msi(pdev);
if (ret) {
xhci_err(xhci, "failed to allocate MSI entry\n");
xhci_dbg(xhci, "failed to allocate MSI entry\n");
return ret;
}

ret = request_irq(pdev->irq, (irq_handler_t)xhci_msi_irq,
0, "xhci_hcd", xhci_to_hcd(xhci));
if (ret) {
xhci_err(xhci, "disable MSI interrupt\n");
xhci_dbg(xhci, "disable MSI interrupt\n");
pci_disable_msi(pdev);
}

Expand Down Expand Up @@ -270,7 +270,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)

ret = pci_enable_msix(pdev, xhci->msix_entries, xhci->msix_count);
if (ret) {
xhci_err(xhci, "Failed to enable MSI-X\n");
xhci_dbg(xhci, "Failed to enable MSI-X\n");
goto free_entries;
}

Expand All @@ -286,7 +286,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
return ret;

disable_msix:
xhci_err(xhci, "disable MSI-X interrupt\n");
xhci_dbg(xhci, "disable MSI-X interrupt\n");
xhci_free_irq(xhci);
pci_disable_msix(pdev);
free_entries:
Expand Down

0 comments on commit 11795d8

Please sign in to comment.