patch-2.4.22 linux-2.4.22/drivers/sound/maestro3.c
Next file: linux-2.4.22/drivers/sound/nec_vrc5477.c
Previous file: linux-2.4.22/drivers/sound/ite8172.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/sound/maestro3.c
- Orig date:
2002-11-28 15:53:14.000000000 -0800
diff -urN linux-2.4.21/drivers/sound/maestro3.c linux-2.4.22/drivers/sound/maestro3.c
@@ -2297,9 +2297,8 @@
{
struct ac97_codec *codec;
- if ((codec = kmalloc(sizeof(struct ac97_codec), GFP_KERNEL)) == NULL)
+ if ((codec = ac97_alloc_codec()) == NULL)
return -ENOMEM;
- memset(codec, 0, sizeof(struct ac97_codec));
codec->private_data = card;
codec->codec_read = m3_ac97_read;
@@ -2309,13 +2308,13 @@
if (ac97_probe_codec(codec) == 0) {
printk(KERN_ERR PFX "codec probe failed\n");
- kfree(codec);
+ ac97_release_codec(codec);
return -1;
}
if ((codec->dev_mixer = register_sound_mixer(&m3_mixer_fops, -1)) < 0) {
printk(KERN_ERR PFX "couldn't register mixer!\n");
- kfree(codec);
+ ac97_release_codec(codec);
return -1;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)