* [PATCH] Check return from pci_find_ext_capability() in atl1c_reset_pcie()
@ 2013-12-19 17:59 Betty Dall
2013-12-20 0:15 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Betty Dall @ 2013-12-19 17:59 UTC (permalink / raw)
To: jcliburn, chris.snook; +Cc: netdev, linux-kernel, Betty Dall
The function atl1c_reset_pcie() does not check the return from
pci_find_ext_cabability() where it is getting the postion of the
PCI_EXT_CAP_ID_ERR. It is possible for the return to be 0.
Signed-off-by: Betty Dall <betty.dall@hp.com>
---
drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index a36a760..2980175 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -145,9 +145,11 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag)
* Mask some pcie error bits
*/
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);
- pci_read_config_dword(pdev, pos + PCI_ERR_UNCOR_SEVER, &data);
- data &= ~(PCI_ERR_UNC_DLP | PCI_ERR_UNC_FCP);
- pci_write_config_dword(pdev, pos + PCI_ERR_UNCOR_SEVER, data);
+ if (pos) {
+ pci_read_config_dword(pdev, pos + PCI_ERR_UNCOR_SEVER, &data);
+ data &= ~(PCI_ERR_UNC_DLP | PCI_ERR_UNC_FCP);
+ pci_write_config_dword(pdev, pos + PCI_ERR_UNCOR_SEVER, data);
+ }
/* clear error status */
pcie_capability_write_word(pdev, PCI_EXP_DEVSTA,
PCI_EXP_DEVSTA_NFED |
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Check return from pci_find_ext_capability() in atl1c_reset_pcie()
2013-12-19 17:59 [PATCH] Check return from pci_find_ext_capability() in atl1c_reset_pcie() Betty Dall
@ 2013-12-20 0:15 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-12-20 0:15 UTC (permalink / raw)
To: betty.dall; +Cc: jcliburn, chris.snook, netdev, linux-kernel
From: Betty Dall <betty.dall@hp.com>
Date: Thu, 19 Dec 2013 10:59:09 -0700
> The function atl1c_reset_pcie() does not check the return from
> pci_find_ext_cabability() where it is getting the postion of the
> PCI_EXT_CAP_ID_ERR. It is possible for the return to be 0.
>
> Signed-off-by: Betty Dall <betty.dall@hp.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-20 0:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-19 17:59 [PATCH] Check return from pci_find_ext_capability() in atl1c_reset_pcie() Betty Dall
2013-12-20 0:15 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).