summaryrefslogtreecommitdiffstats
path: root/sound/ppc/awacs.c
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis@issaris.org>2006-07-25 15:28:03 +0200
committerJaroslav Kysela <perex@suse.cz>2006-08-03 15:21:18 +0200
commit59feddb25f9d925e86ee22596802405788bc050f (patch)
tree0d272bdcb64cf2bcc19adf8735215ce261aea355 /sound/ppc/awacs.c
parentfb6a0d635d4ff6b3555179d0154981f03427071a (diff)
downloadop-kernel-dev-59feddb25f9d925e86ee22596802405788bc050f.zip
op-kernel-dev-59feddb25f9d925e86ee22596802405788bc050f.tar.gz
[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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 82d791b..05dabe4 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -801,11 +801,10 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
chip->revision = (in_le32(&chip->awacs->codec_stat) >> 12) & 0xf;
#ifdef PMAC_AMP_AVAIL
if (chip->revision == 3 && chip->has_iic && CHECK_CUDA_AMP()) {
- struct awacs_amp *amp = kmalloc(sizeof(*amp), GFP_KERNEL);
+ struct awacs_amp *amp = kzalloc(sizeof(*amp), GFP_KERNEL);
if (! amp)
return -ENOMEM;
chip->mixer_data = amp;
- memset(amp, 0, sizeof(*amp));
chip->mixer_free = awacs_amp_free;
awacs_amp_set_vol(amp, 0, 63, 63, 0); /* mute and zero vol */
awacs_amp_set_vol(amp, 1, 63, 63, 0);
OpenPOWER on IntegriCloud