From 41c634142da8d268fb69e7c410cc177bd68041f4 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 17 Jan 2006 13:43:18 -0800
Subject: [PATCH] --- yaml --- r: 18835 b: refs/heads/master c:
 6aad85d6730d47d4867f24eeda517766aa89f8d0 h: refs/heads/master i:   18833:
 d8ae494fed6d53d161778a2b6caff245cf29d5a3   18831:
 48ff07643959b478069bb780f503c017184db9f3 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a142d3f828ad..0bc7b950a4ae 100644
--- 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
index 9308b3bbb5cb..9dc4adb95a7c 100644
--- 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);