Commit c3b26786 authored by Marcus Alanen's avatar Marcus Alanen Committed by Linus Torvalds

Correctly free resources in old-OSS esssolo1 sound driver

parent c77fde96
...@@ -2384,9 +2384,9 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device ...@@ -2384,9 +2384,9 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device
return 0; return 0;
err: err:
unregister_sound_dsp(s->dev_dmfm); unregister_sound_special(s->dev_dmfm);
err_dev4: err_dev4:
unregister_sound_dsp(s->dev_midi); unregister_sound_midi(s->dev_midi);
err_dev3: err_dev3:
unregister_sound_mixer(s->dev_mixer); unregister_sound_mixer(s->dev_mixer);
err_dev2: err_dev2:
...@@ -2397,13 +2397,13 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device ...@@ -2397,13 +2397,13 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device
err_irq: err_irq:
if (s->gameport.io) if (s->gameport.io)
release_region(s->gameport.io, GAMEPORT_EXTENT); release_region(s->gameport.io, GAMEPORT_EXTENT);
release_region(s->iobase, IOBASE_EXTENT); release_region(s->mpubase, MPUBASE_EXTENT);
err_region4: err_region4:
release_region(s->sbbase+FMSYNTH_EXTENT, SBBASE_EXTENT-FMSYNTH_EXTENT);
err_region3:
release_region(s->ddmabase, DDMABASE_EXTENT); release_region(s->ddmabase, DDMABASE_EXTENT);
err_region3:
release_region(s->sbbase+FMSYNTH_EXTENT, SBBASE_EXTENT-FMSYNTH_EXTENT);
err_region2: err_region2:
release_region(s->mpubase, MPUBASE_EXTENT); release_region(s->iobase, IOBASE_EXTENT);
err_region1: err_region1:
kfree(s); kfree(s);
return ret; return ret;
......
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