Skip to content

L
linux
Commit c4fc7293 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files
Options

[PATCH] janitor: es1370: pci_alloc_consistent error handling 

From: Leann Ogasawara <ogasawara@osdl.org>
parent 893fca8a
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
sound/oss/es1370.c
View file @ c4fc7293
...@@ -2645,6 +2645,10 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic ...@@ -2645,6 +2645,10 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic
outl(s->sctrl, s->io+ES1370_REG_SERIAL_CONTROL); outl(s->sctrl, s->io+ES1370_REG_SERIAL_CONTROL);
/* point phantom write channel to "bugbuf" */ /* point phantom write channel to "bugbuf" */
s->bugbuf_cpu = pci_alloc_consistent(pcidev,16,&s->bugbuf_dma); s->bugbuf_cpu = pci_alloc_consistent(pcidev,16,&s->bugbuf_dma);
if (!s->bugbuf_cpu) {
ret = -ENOMEM;
goto err_dev5;
}
outl((ES1370_REG_PHANTOM_FRAMEADR >> 8) & 15, s->io+ES1370_REG_MEMPAGE); outl((ES1370_REG_PHANTOM_FRAMEADR >> 8) & 15, s->io+ES1370_REG_MEMPAGE);
outl(s->bugbuf_dma, s->io+(ES1370_REG_PHANTOM_FRAMEADR & 0xff)); outl(s->bugbuf_dma, s->io+(ES1370_REG_PHANTOM_FRAMEADR & 0xff));
outl(0, s->io+(ES1370_REG_PHANTOM_FRAMECNT & 0xff)); outl(0, s->io+(ES1370_REG_PHANTOM_FRAMECNT & 0xff));
...@@ -2676,6 +2680,8 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic ...@@ -2676,6 +2680,8 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic
devindex++; devindex++;
return 0; return 0;
err_dev5:
unregister_sound_midi(s->dev_midi);
err_dev4: err_dev4:
unregister_sound_dsp(s->dev_dac); unregister_sound_dsp(s->dev_dac);
err_dev3: err_dev3:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7