vmxnet3: set netdev parant device before calling netdev_info
authorShreyas Bhatewara <sbhatewara@vmware.com>
Wed, 20 Jul 2011 16:01:11 +0000 (16:01 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Jul 2011 03:39:47 +0000 (20:39 -0700)
Parent device for netdev should be set before netdev_info() can be called
otherwise there is a NULL pointer dereference and probe() fails.

Signed-off-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
Signed-off-by: Scott J. Goldman <scottjg@vmware.com>--
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vmxnet3/vmxnet3_drv.c

index 009277e1084f1dedf8400178779170548573b9cf..1a8cc5bf06bbebb8915ba55ef2f3ff9a2c21fa17 100644 (file)
@@ -2993,6 +2993,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
                goto err_ver;
        }
 
+       SET_NETDEV_DEV(netdev, &pdev->dev);
        vmxnet3_declare_features(adapter, dma64);
 
        adapter->dev_number = atomic_read(&devices_found);
@@ -3038,7 +3039,6 @@ vmxnet3_probe_device(struct pci_dev *pdev,
        netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);
        netif_set_real_num_rx_queues(adapter->netdev, adapter->num_rx_queues);
 
-       SET_NETDEV_DEV(netdev, &pdev->dev);
        err = register_netdev(netdev);
 
        if (err) {