---

yaml --- r: 18835 b: refs/heads/master c: 6aad85d h: refs/heads/master i: 18833: d8ae494 18831: 48ff076 v: v3
git-mirror · Jan 18, 2006 · 41c6341 · 41c6341
1 parent 1e67a81
commit 41c6341
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3be92a70237a1bd813e46d6683a55b508627013a
+refs/heads/master: 6aad85d6730d47d4867f24eeda517766aa89f8d0
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -3099,14 +3099,13 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
 #endif
 
 	err = -ENOMEM;
-	hw = kmalloc(sizeof(*hw), GFP_KERNEL);
+	hw = kzalloc(sizeof(*hw), GFP_KERNEL);
 	if (!hw) {
 		printk(KERN_ERR PFX "%s: cannot allocate hardware struct\n",
 		       pci_name(pdev));
 		goto err_out_free_regions;
 	}
 
-	memset(hw, 0, sizeof(*hw));
 	hw->pdev = pdev;
 
 	hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);