Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195275
b: refs/heads/master
c: beae22e
h: refs/heads/master
i:
  195273: 5f3ac67
  195271: 9abc574
v: v3
  • Loading branch information
Julia Lawall authored and David S. Miller committed May 18, 2010
1 parent 3e2fbaf commit ebf2614
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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: 2e3219b5c8a2e44e0b83ae6e04f52f20a82ac0f2
refs/heads/master: beae22e6f393c461ee7fb394dbf06fa50157836b
3 changes: 1 addition & 2 deletions trunk/drivers/net/mv643xx_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -2608,10 +2608,9 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
goto out;

ret = -ENOMEM;
msp = kmalloc(sizeof(*msp), GFP_KERNEL);
msp = kzalloc(sizeof(*msp), GFP_KERNEL);
if (msp == NULL)
goto out;
memset(msp, 0, sizeof(*msp));

msp->base = ioremap(res->start, res->end - res->start + 1);
if (msp->base == NULL)
Expand Down

0 comments on commit ebf2614

Please sign in to comment.