diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:25:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:25:02 -0400 |
| commit | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (patch) | |
| tree | d0abb5c923a7a3eca2d4b2c3e1964bf484870909 /sound/isa/sb/sb_common.c | |
| parent | 165415f700b0c77fa1f8db6198f48582639adf78 (diff) | |
| parent | 87e807b6c461bbd449496a4c3ab78ab164a4ba97 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/isa/sb/sb_common.c')
| -rw-r--r-- | sound/isa/sb/sb_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c index 5b6bde213ea0..f0f205ae425f 100644 --- a/sound/isa/sb/sb_common.c +++ b/sound/isa/sb/sb_common.c | |||
| @@ -221,7 +221,7 @@ int snd_sbdsp_create(snd_card_t *card, | |||
| 221 | 221 | ||
| 222 | snd_assert(r_chip != NULL, return -EINVAL); | 222 | snd_assert(r_chip != NULL, return -EINVAL); |
| 223 | *r_chip = NULL; | 223 | *r_chip = NULL; |
| 224 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 224 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 225 | if (chip == NULL) | 225 | if (chip == NULL) |
| 226 | return -ENOMEM; | 226 | return -ENOMEM; |
| 227 | spin_lock_init(&chip->reg_lock); | 227 | spin_lock_init(&chip->reg_lock); |