patch-2.4.22 linux-2.4.22/drivers/sound/esssolo1.c
Next file: linux-2.4.22/drivers/sound/forte.c
Previous file: linux-2.4.22/drivers/sound/es1371.c
Back to the patch index
Back to the overall index
- Lines: 30
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/sound/esssolo1.c
- Orig date:
2003-06-13 07:51:36.000000000 -0700
diff -urN linux-2.4.21/drivers/sound/esssolo1.c linux-2.4.22/drivers/sound/esssolo1.c
@@ -2378,9 +2378,9 @@
return 0;
err:
- unregister_sound_dsp(s->dev_dmfm);
+ unregister_sound_special(s->dev_dmfm);
err_dev4:
- unregister_sound_dsp(s->dev_midi);
+ unregister_sound_midi(s->dev_midi);
err_dev3:
unregister_sound_mixer(s->dev_mixer);
err_dev2:
@@ -2391,13 +2391,13 @@
err_irq:
if (s->gameport.io)
release_region(s->gameport.io, GAMEPORT_EXTENT);
- release_region(s->iobase, IOBASE_EXTENT);
+ release_region(s->mpubase, MPUBASE_EXTENT);
err_region4:
- release_region(s->sbbase+FMSYNTH_EXTENT, SBBASE_EXTENT-FMSYNTH_EXTENT);
- err_region3:
release_region(s->ddmabase, DDMABASE_EXTENT);
+ err_region3:
+ release_region(s->sbbase+FMSYNTH_EXTENT, SBBASE_EXTENT-FMSYNTH_EXTENT);
err_region2:
- release_region(s->mpubase, MPUBASE_EXTENT);
+ release_region(s->iobase, IOBASE_EXTENT);
err_region1:
kfree(s);
return ret;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)