patch-2.4.0-test7 linux/drivers/sound/sscape.c
Next file: linux/drivers/sound/sys_timer.c
Previous file: linux/drivers/sound/soundmodule.h
Back to the patch index
Back to the overall index
- Lines: 66
- Date:
Fri Aug 11 08:26:44 2000
- Orig file:
v2.4.0-test6/linux/drivers/sound/sscape.c
- Orig date:
Wed Aug 9 19:19:51 2000
diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/sscape.c linux/drivers/sound/sscape.c
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include "sound_config.h"
-#include "soundmodule.h"
#include "sound_firmware.h"
#include <linux/types.h>
@@ -728,7 +727,7 @@
hw_config->name = "SoundScape";
hw_config->irq *= -1; /* Negative value signals IRQ sharing */
- attach_mpu401(hw_config);
+ attach_mpu401(hw_config, THIS_MODULE);
hw_config->irq *= -1; /* Restore it */
if (hw_config->slots[1] != -1) /* The MPU driver installed itself */
@@ -1378,21 +1377,16 @@
if (hw_config->irq == devc->irq)
printk(KERN_WARNING "soundscape: Warning! The WSS mode can't share IRQ with MIDI\n");
- if (! sscape_is_pnp )
- hw_config->slots[0] = ad1848_init("SoundScape", hw_config->io_base,
- hw_config->irq,
- hw_config->dma,
- hw_config->dma,
- 0,
- devc->osp);
-
- else
- hw_config->slots[0] = ad1848_init("SoundScape PNP", hw_config->io_base,
- hw_config->irq,
- hw_config->dma,
- hw_config->dma,
- 0,
- devc->osp);
+ hw_config->slots[0] = ad1848_init(
+ sscape_is_pnp ? "SoundScape" : "SoundScape PNP",
+ hw_config->io_base,
+ hw_config->irq,
+ hw_config->dma,
+ hw_config->dma,
+ 0,
+ devc->osp,
+ THIS_MODULE);
+
if (hw_config->slots[0] != -1) /* The AD1848 driver installed itself */
{
@@ -1497,7 +1491,7 @@
if (mss)
attach_ss_ms_sound(&cfg);
- SOUND_LOCK;
+
return 0;
}
@@ -1505,7 +1499,6 @@
{
if (mss)
unload_ss_ms_sound(&cfg);
- SOUND_LOCK_END;
unload_sscape(&cfg_mpu);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)