diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /drivers/block/aoe/aoedev.c | |
| parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/block/aoe/aoedev.c')
| -rw-r--r-- | drivers/block/aoe/aoedev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c index 6e231c5a1199..ded33ba31acc 100644 --- a/drivers/block/aoe/aoedev.c +++ b/drivers/block/aoe/aoedev.c | |||
| @@ -35,7 +35,7 @@ aoedev_newdev(ulong nframes) | |||
| 35 | struct aoedev *d; | 35 | struct aoedev *d; |
| 36 | struct frame *f, *e; | 36 | struct frame *f, *e; |
| 37 | 37 | ||
| 38 | d = kcalloc(1, sizeof *d, GFP_ATOMIC); | 38 | d = kzalloc(sizeof *d, GFP_ATOMIC); |
| 39 | if (d == NULL) | 39 | if (d == NULL) |
| 40 | return NULL; | 40 | return NULL; |
| 41 | f = kcalloc(nframes, sizeof *f, GFP_ATOMIC); | 41 | f = kcalloc(nframes, sizeof *f, GFP_ATOMIC); |