Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286613
b: refs/heads/master
c: 6e9292c
h: refs/heads/master
i:
  286611: 23648c2
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Jan 23, 2012
1 parent 6436e8e commit 36c1e63
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 78d79559f2af1e77034436326aa20f2654074e4c
refs/heads/master: 6e9292c588894bd39eb2d093013f0aee558ddf0e
6 changes: 3 additions & 3 deletions trunk/drivers/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -2802,7 +2802,7 @@ pci_intx(struct pci_dev *pdev, int enable)

/**
* pci_intx_mask_supported - probe for INTx masking support
* @pdev: the PCI device to operate on
* @dev: the PCI device to operate on
*
* Check if the device dev support INTx masking via the config space
* command word.
Expand Down Expand Up @@ -2884,7 +2884,7 @@ static bool pci_check_and_set_intx_mask(struct pci_dev *dev, bool mask)

/**
* pci_check_and_mask_intx - mask INTx on pending interrupt
* @pdev: the PCI device to operate on
* @dev: the PCI device to operate on
*
* Check if the device dev has its INTx line asserted, mask it and
* return true in that case. False is returned if not interrupt was
Expand All @@ -2898,7 +2898,7 @@ EXPORT_SYMBOL_GPL(pci_check_and_mask_intx);

/**
* pci_check_and_mask_intx - unmask INTx of no interrupt is pending
* @pdev: the PCI device to operate on
* @dev: the PCI device to operate on
*
* Check if the device dev has its INTx line asserted, unmask it if not
* and return true. False is returned and the mask remains active if
Expand Down

0 comments on commit 36c1e63

Please sign in to comment.