From 1a727a267726039be1f8b50ded835ec641d66338 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 1 Dec 2006 16:36:14 -0800 Subject: [PATCH] --- yaml --- r: 41555 b: refs/heads/master c: 1270266cf94c0de5bd1121f15aff9af8556dee84 h: refs/heads/master i: 41553: bdbc814cf85d91208db10722bb63d7bfadce0332 41551: c159bff725a43e635ec9bfc704d04f06b08c69f2 v: v3 --- [refs] | 2 +- trunk/drivers/net/chelsio/mv88x201x.c | 4 ++-- trunk/drivers/net/chelsio/pm3393.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ab78ea99ac8f..2b2cb90f3b7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11e5a202ca9e93ecb5ff314a6a345e0e4db77d97 +refs/heads/master: 1270266cf94c0de5bd1121f15aff9af8556dee84 diff --git a/trunk/drivers/net/chelsio/mv88x201x.c b/trunk/drivers/net/chelsio/mv88x201x.c index db5034282782..bf7d8538885d 100644 --- a/trunk/drivers/net/chelsio/mv88x201x.c +++ b/trunk/drivers/net/chelsio/mv88x201x.c @@ -205,11 +205,11 @@ static struct cphy *mv88x201x_phy_create(adapter_t *adapter, int phy_addr, struct mdio_ops *mdio_ops) { u32 val; - struct cphy *cphy = kmalloc(sizeof(*cphy), GFP_KERNEL); + struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL); if (!cphy) return NULL; - memset(cphy, 0, sizeof(*cphy)); + cphy_init(cphy, adapter, phy_addr, &mv88x201x_ops, mdio_ops); /* Commands the PHY to enable XFP's clock. */ diff --git a/trunk/drivers/net/chelsio/pm3393.c b/trunk/drivers/net/chelsio/pm3393.c index b442b585b4b1..50983f9ce4bc 100644 --- a/trunk/drivers/net/chelsio/pm3393.c +++ b/trunk/drivers/net/chelsio/pm3393.c @@ -631,10 +631,9 @@ static struct cmac *pm3393_mac_create(adapter_t *adapter, int index) { struct cmac *cmac; - cmac = kmalloc(sizeof(*cmac) + sizeof(cmac_instance), GFP_KERNEL); + cmac = kzalloc(sizeof(*cmac) + sizeof(cmac_instance), GFP_KERNEL); if (!cmac) return NULL; - memset(cmac, 0, sizeof(*cmac)); cmac->ops = &pm3393_ops; cmac->instance = (cmac_instance *) (cmac + 1);