diff --git a/[refs] b/[refs] index 2cd9c2b02738..04273fea88d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: decf67aa2f4d498c02c2ad24a187a66c217f330c +refs/heads/master: 26fc354914219a91254afd0df573fc801bb1183a diff --git a/trunk/drivers/net/sk98lin/skge.c b/trunk/drivers/net/sk98lin/skge.c index 87bfe4c24a77..9f89c23191d0 100644 --- a/trunk/drivers/net/sk98lin/skge.c +++ b/trunk/drivers/net/sk98lin/skge.c @@ -4807,14 +4807,13 @@ static int __devinit skge_probe_one(struct pci_dev *pdev, } pNet = netdev_priv(dev); - pNet->pAC = kmalloc(sizeof(SK_AC), GFP_KERNEL); + pNet->pAC = kzalloc(sizeof(SK_AC), GFP_KERNEL); if (!pNet->pAC) { printk(KERN_ERR "Unable to allocate adapter " "structure!\n"); goto out_free_netdev; } - memset(pNet->pAC, 0, sizeof(SK_AC)); pAC = pNet->pAC; pAC->PciDev = pdev;