Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45748
b: refs/heads/master
c: 4384247
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jan 23, 2007
1 parent 863e2b2 commit 4fefdff
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: 0a3c4bdc1b197a7d37fc75643a68daf45fe0a7cc
refs/heads/master: 4384247b6910df91049f8d0bbd5c1075898ac290
3 changes: 1 addition & 2 deletions trunk/drivers/net/s2io.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,10 +556,9 @@ static int init_shared_mem(struct s2io_nic *nic)
}
}

nic->ufo_in_band_v = kmalloc((sizeof(u64) * size), GFP_KERNEL);
nic->ufo_in_band_v = kcalloc(size, sizeof(u64), GFP_KERNEL);
if (!nic->ufo_in_band_v)
return -ENOMEM;
memset(nic->ufo_in_band_v, 0, size);

/* Allocation and initialization of RXDs in Rings */
size = 0;
Expand Down

0 comments on commit 4fefdff

Please sign in to comment.