patch-2.4.0-test7 linux/drivers/sound/maui.c
Next file: linux/drivers/sound/midi_synth.c
Previous file: linux/drivers/sound/maestro.c
Back to the patch index
Back to the overall index
- Lines: 34
- Date:
Fri Aug 11 08:26:43 2000
- Orig file:
v2.4.0-test6/linux/drivers/sound/maui.c
- Orig date:
Tue Mar 7 14:32:26 2000
diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/maui.c linux/drivers/sound/maui.c
@@ -30,7 +30,6 @@
#define USE_SIMPLE_MACROS
#include "sound_config.h"
-#include "soundmodule.h"
#include "sound_firmware.h"
#include "mpu401.h"
@@ -375,7 +374,7 @@
hw_config->irq *= -1;
hw_config->name = "Maui";
- attach_mpu401(hw_config);
+ attach_mpu401(hw_config, THIS_MODULE);
if (hw_config->slots[1] != -1) /* The MPU401 driver installed itself */ {
struct synth_operations *synth;
@@ -443,7 +442,7 @@
if (probe_maui(&cfg) == 0)
return -ENODEV;
attach_maui(&cfg);
- SOUND_LOCK;
+
return 0;
}
@@ -452,7 +451,6 @@
if (fw_load && maui_os)
vfree(maui_os);
unload_maui(&cfg);
- SOUND_LOCK_END;
}
module_init(init_maui);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)