diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-19 12:41:24 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-19 12:41:24 -0400 |
| commit | 9ce28d827f74d0acdd058bded8bab5309b0f5c8f (patch) | |
| tree | 634f22e8df9c7fd3966b3639e3e997436751ca50 /drivers/pci/pci.c | |
| parent | f074ff92b5b26f3a559fab1203c36e140ea8d067 (diff) | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
Merge tag 'v3.3' into staging/for_v3.4
* tag 'v3.3': (1646 commits)
Linux 3.3
Don't limit non-nested epoll paths
netfilter: ctnetlink: fix race between delete and timeout expiration
ipv6: Don't dev_hold(dev) in ip6_mc_find_dev_rcu.
nilfs2: fix NULL pointer dereference in nilfs_load_super_block()
nilfs2: clamp ns_r_segments_percentage to [1, 99]
afs: Remote abort can cause BUG in rxrpc code
afs: Read of file returns EBADMSG
C6X: remove dead code from entry.S
wimax/i2400m: fix erroneous NETDEV_TX_BUSY use
net/hyperv: fix erroneous NETDEV_TX_BUSY use
net/usbnet: reserve headroom on rx skbs
bnx2x: fix memory leak in bnx2x_init_firmware()
bnx2x: fix a crash on corrupt firmware file
sch_sfq: revert dont put new flow at the end of flows
ipv6: fix icmp6_dst_alloc()
MAINTAINERS: Add Serge as maintainer of capabilities
drivers/video/backlight/s6e63m0.c: fix corruption storing gamma mode
MAINTAINERS: add entry for exynos mipi display drivers
MAINTAINERS: fix link to Gustavo Padovans tree
...
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 97fff785e97e..af295bb21d62 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -2802,7 +2802,7 @@ pci_intx(struct pci_dev *pdev, int enable) | |||
| 2802 | 2802 | ||
| 2803 | /** | 2803 | /** |
| 2804 | * pci_intx_mask_supported - probe for INTx masking support | 2804 | * pci_intx_mask_supported - probe for INTx masking support |
| 2805 | * @pdev: the PCI device to operate on | 2805 | * @dev: the PCI device to operate on |
| 2806 | * | 2806 | * |
| 2807 | * Check if the device dev support INTx masking via the config space | 2807 | * Check if the device dev support INTx masking via the config space |
| 2808 | * command word. | 2808 | * command word. |
| @@ -2884,7 +2884,7 @@ done: | |||
| 2884 | 2884 | ||
| 2885 | /** | 2885 | /** |
| 2886 | * pci_check_and_mask_intx - mask INTx on pending interrupt | 2886 | * pci_check_and_mask_intx - mask INTx on pending interrupt |
| 2887 | * @pdev: the PCI device to operate on | 2887 | * @dev: the PCI device to operate on |
| 2888 | * | 2888 | * |
| 2889 | * Check if the device dev has its INTx line asserted, mask it and | 2889 | * Check if the device dev has its INTx line asserted, mask it and |
| 2890 | * return true in that case. False is returned if not interrupt was | 2890 | * return true in that case. False is returned if not interrupt was |
| @@ -2898,7 +2898,7 @@ EXPORT_SYMBOL_GPL(pci_check_and_mask_intx); | |||
| 2898 | 2898 | ||
| 2899 | /** | 2899 | /** |
| 2900 | * pci_check_and_mask_intx - unmask INTx of no interrupt is pending | 2900 | * pci_check_and_mask_intx - unmask INTx of no interrupt is pending |
| 2901 | * @pdev: the PCI device to operate on | 2901 | * @dev: the PCI device to operate on |
| 2902 | * | 2902 | * |
| 2903 | * Check if the device dev has its INTx line asserted, unmask it if not | 2903 | * Check if the device dev has its INTx line asserted, unmask it if not |
| 2904 | * and return true. False is returned and the mask remains active if | 2904 | * and return true. False is returned and the mask remains active if |