Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41555
b: refs/heads/master
c: 1270266
h: refs/heads/master
i:
  41553: bdbc814
  41551: c159bff
v: v3
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Dec 2, 2006
1 parent cf3bfd7 commit 1a727a2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 11e5a202ca9e93ecb5ff314a6a345e0e4db77d97
refs/heads/master: 1270266cf94c0de5bd1121f15aff9af8556dee84
4 changes: 2 additions & 2 deletions trunk/drivers/net/chelsio/mv88x201x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/net/chelsio/pm3393.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 1a727a2

Please sign in to comment.