diff --git a/[refs] b/[refs] index 734e874ae691..db8c3db6de52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6accec76f6889f85dd62cadefe18afb8343558d1 +refs/heads/master: c26875e2e1a07137f6e7a621fa802b03c00535b6 diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c index f9f9ed8a8138..b8b85843c614 100644 --- a/trunk/drivers/net/s2io.c +++ b/trunk/drivers/net/s2io.c @@ -7886,7 +7886,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) /* Private member variable initialized to s2io NIC structure */ sp = netdev_priv(dev); - memset(sp, 0, sizeof(struct s2io_nic)); sp->dev = dev; sp->pdev = pdev; sp->high_dma_flag = dma_flag;