diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /sound/i2c/other/ak4114.c | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'sound/i2c/other/ak4114.c')
| -rw-r--r-- | sound/i2c/other/ak4114.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c index 5adde308a00f..af5eadcddd92 100644 --- a/sound/i2c/other/ak4114.c +++ b/sound/i2c/other/ak4114.c | |||
| @@ -92,7 +92,7 @@ int snd_ak4114_create(snd_card_t *card, | |||
| 92 | .dev_free = snd_ak4114_dev_free, | 92 | .dev_free = snd_ak4114_dev_free, |
| 93 | }; | 93 | }; |
| 94 | 94 | ||
| 95 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 95 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 96 | if (chip == NULL) | 96 | if (chip == NULL) |
| 97 | return -ENOMEM; | 97 | return -ENOMEM; |
| 98 | spin_lock_init(&chip->lock); | 98 | spin_lock_init(&chip->lock); |