diff options
author | Dan Carpenter <error27@gmail.com> | 2010-07-26 20:05:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-27 23:48:19 -0400 |
commit | b8bc0421ab7f83712a0a8ef7eb05fa73ec53c027 (patch) | |
tree | 52729de729a67ee25b80dba27b8e470a6dbbb2af /drivers | |
parent | 94fe8c683cea97fe2c59a5f0dc206aa329c5763c (diff) |
ixgbe: potential null dereference
The e_dev_err() macro dereferences "adapter" which is NULL here.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index bc22ab4336be..e92acbf5a307 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -6552,8 +6552,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
6552 | err = dma_set_coherent_mask(&pdev->dev, | 6552 | err = dma_set_coherent_mask(&pdev->dev, |
6553 | DMA_BIT_MASK(32)); | 6553 | DMA_BIT_MASK(32)); |
6554 | if (err) { | 6554 | if (err) { |
6555 | e_dev_err("No usable DMA configuration, " | 6555 | dev_err(&pdev->dev, |
6556 | "aborting\n"); | 6556 | "No usable DMA configuration, aborting\n"); |
6557 | goto err_dma; | 6557 | goto err_dma; |
6558 | } | 6558 | } |
6559 | } | 6559 | } |
@@ -6563,7 +6563,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
6563 | err = pci_request_selected_regions(pdev, pci_select_bars(pdev, | 6563 | err = pci_request_selected_regions(pdev, pci_select_bars(pdev, |
6564 | IORESOURCE_MEM), ixgbe_driver_name); | 6564 | IORESOURCE_MEM), ixgbe_driver_name); |
6565 | if (err) { | 6565 | if (err) { |
6566 | e_dev_err("pci_request_selected_regions failed 0x%x\n", err); | 6566 | dev_err(&pdev->dev, |
6567 | "pci_request_selected_regions failed 0x%x\n", err); | ||
6567 | goto err_pci_reg; | 6568 | goto err_pci_reg; |
6568 | } | 6569 | } |
6569 | 6570 | ||