ixgbe: potential null dereference
authorDan Carpenter <error27@gmail.com>
Tue, 27 Jul 2010 00:05:56 +0000 (00:05 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Jul 2010 03:48:19 +0000 (20:48 -0700)
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>
drivers/net/ixgbe/ixgbe_main.c

index bc22ab4336beda432f8688d599b9b0f0acfec2d0..e92acbf5a30792fe6819a3017c0ed18f978c263e 100644 (file)
@@ -6552,8 +6552,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                        err = dma_set_coherent_mask(&pdev->dev,
                                                    DMA_BIT_MASK(32));
                        if (err) {
-                               e_dev_err("No usable DMA configuration, "
-                                         "aborting\n");
+                               dev_err(&pdev->dev,
+                                       "No usable DMA configuration, aborting\n");
                                goto err_dma;
                        }
                }
@@ -6563,7 +6563,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
        err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
                                           IORESOURCE_MEM), ixgbe_driver_name);
        if (err) {
-               e_dev_err("pci_request_selected_regions failed 0x%x\n", err);
+               dev_err(&pdev->dev,
+                       "pci_request_selected_regions failed 0x%x\n", err);
                goto err_pci_reg;
        }