diff options
author | Panagiotis Issaris <takis@issaris.org> | 2006-07-25 09:28:03 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-08-03 09:21:18 -0400 |
commit | 59feddb25f9d925e86ee22596802405788bc050f (patch) | |
tree | 0d272bdcb64cf2bcc19adf8735215ce261aea355 /sound/ppc/awacs.c | |
parent | fb6a0d635d4ff6b3555179d0154981f03427071a (diff) |
[ALSA] Conversions from kmalloc+memset to k(z|c)alloc
sound: Conversions from kmalloc+memset to k(c|z)alloc.
Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/ppc/awacs.c')
-rw-r--r-- | sound/ppc/awacs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c index 82d791be7499..05dabe454658 100644 --- a/sound/ppc/awacs.c +++ b/sound/ppc/awacs.c | |||
@@ -801,11 +801,10 @@ snd_pmac_awacs_init(struct snd_pmac *chip) | |||
801 | chip->revision = (in_le32(&chip->awacs->codec_stat) >> 12) & 0xf; | 801 | chip->revision = (in_le32(&chip->awacs->codec_stat) >> 12) & 0xf; |
802 | #ifdef PMAC_AMP_AVAIL | 802 | #ifdef PMAC_AMP_AVAIL |
803 | if (chip->revision == 3 && chip->has_iic && CHECK_CUDA_AMP()) { | 803 | if (chip->revision == 3 && chip->has_iic && CHECK_CUDA_AMP()) { |
804 | struct awacs_amp *amp = kmalloc(sizeof(*amp), GFP_KERNEL); | 804 | struct awacs_amp *amp = kzalloc(sizeof(*amp), GFP_KERNEL); |
805 | if (! amp) | 805 | if (! amp) |
806 | return -ENOMEM; | 806 | return -ENOMEM; |
807 | chip->mixer_data = amp; | 807 | chip->mixer_data = amp; |
808 | memset(amp, 0, sizeof(*amp)); | ||
809 | chip->mixer_free = awacs_amp_free; | 808 | chip->mixer_free = awacs_amp_free; |
810 | awacs_amp_set_vol(amp, 0, 63, 63, 0); /* mute and zero vol */ | 809 | awacs_amp_set_vol(amp, 0, 63, 63, 0); /* mute and zero vol */ |
811 | awacs_amp_set_vol(amp, 1, 63, 63, 0); | 810 | awacs_amp_set_vol(amp, 1, 63, 63, 0); |