lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] ppc-beep - handle errors from input_register_device()

Browse Source 
ppc-beep: handle errors from input_register_device()
(Also fixed the wrong memory release in the error path.)

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Dmitry Torokhov
2006-08-03 15:06:14 +02:00
committed by Jaroslav Kysela
parent 548a648b98
commit f03d68fe34
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sound/ppc/beep.c
View File

@@ -215,15 +215,18 @@ int __init snd_pmac_attach_beep(struct snd_pmac *chip)
{ {
struct pmac_beep *beep; struct pmac_beep *beep;
struct input_dev *input_dev; struct input_dev *input_dev;
struct snd_kcontrol *beep_ctl;
void *dmabuf; void *dmabuf;
int err = -ENOMEM; int err = -ENOMEM;
beep = kzalloc(sizeof(*beep), GFP_KERNEL); beep = kzalloc(sizeof(*beep), GFP_KERNEL);
if (! beep)
return -ENOMEM;
dmabuf = dma_alloc_coherent(&chip->pdev->dev, BEEP_BUFLEN * 4, dmabuf = dma_alloc_coherent(&chip->pdev->dev, BEEP_BUFLEN * 4,
&beep->addr, GFP_KERNEL); &beep->addr, GFP_KERNEL);
input_dev = input_allocate_device(); input_dev = input_allocate_device();
if (!beep || !dmabuf || !input_dev) if (! dmabuf || ! input_dev)
goto fail; goto fail1;
/* FIXME: set more better values */ /* FIXME: set more better values */
input_dev->name = "PowerMac Beep"; input_dev->name = "PowerMac Beep";
@@ -244,17 +247,24 @@ int __init snd_pmac_attach_beep(struct snd_pmac *chip)
beep->volume = BEEP_VOLUME; beep->volume = BEEP_VOLUME;
beep->running = 0; beep->running = 0;
err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_pmac_beep_mixer, chip)); beep_ctl = snd_ctl_new1(&snd_pmac_beep_mixer, chip);
err = snd_ctl_add(chip->card, beep_ctl);
if (err < 0) if (err < 0)
goto fail; goto fail1;
chip->beep = beep;
chip->beep = beep; err = input_register_device(beep->dev);
input_register_device(beep->dev); if (err)
goto fail2;
return 0;
return 0;
fail: input_free_device(input_dev);
kfree(dmabuf); fail2: snd_ctl_remove(chip->card, beep_ctl);
fail1: input_free_device(input_dev);
if (dmabuf)
dma_free_coherent(&chip->pdev->dev, BEEP_BUFLEN * 4,
dmabuf, beep->addr);
kfree(beep); kfree(beep);
return err; return err;
} }