diff --git a/[refs] b/[refs] index 9b5911ec7421..5465762ea1d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 163642a24a44d7b1d1e1b3cb8da25a142a919e24 +refs/heads/master: 9dc83afdbefd184bf29f347e8fcbb6d8a2b5e6fe diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c index cf4a92436aa8..acba90f1638e 100644 --- a/trunk/drivers/net/ibmveth.c +++ b/trunk/drivers/net/ibmveth.c @@ -963,7 +963,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_ { int rc, i; struct net_device *netdev; - struct ibmveth_adapter *adapter = NULL; + struct ibmveth_adapter *adapter; unsigned char *mac_addr_p; unsigned int *mcastFilterSize_p; @@ -997,7 +997,6 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_ SET_MODULE_OWNER(netdev); adapter = netdev->priv; - memset(adapter, 0, sizeof(adapter)); dev->dev.driver_data = netdev; adapter->vdev = dev;