summaryrefslogtreecommitdiffstats
path: root/kernel/sound/oss
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/oss')
-rw-r--r--kernel/sound/oss/ad1848.c2
-rw-r--r--kernel/sound/oss/msnd_pinnacle.c3
-rw-r--r--kernel/sound/oss/sb_audio.c8
3 files changed, 5 insertions, 8 deletions
diff --git a/kernel/sound/oss/ad1848.c b/kernel/sound/oss/ad1848.c
index ec1ee07df..10c8de1f8 100644
--- a/kernel/sound/oss/ad1848.c
+++ b/kernel/sound/oss/ad1848.c
@@ -2860,6 +2860,7 @@ static struct {
{NULL}
};
+#ifdef MODULE
static struct isapnp_device_id id_table[] = {
{ ISAPNP_VENDOR('C','M','I'), ISAPNP_DEVICE(0x0001),
ISAPNP_VENDOR('@','@','@'), ISAPNP_FUNCTION(0x0001), 0 },
@@ -2877,6 +2878,7 @@ static struct isapnp_device_id id_table[] = {
};
MODULE_DEVICE_TABLE(isapnp, id_table);
+#endif
static struct pnp_dev *activate_dev(char *devname, char *resname, struct pnp_dev *dev)
{
diff --git a/kernel/sound/oss/msnd_pinnacle.c b/kernel/sound/oss/msnd_pinnacle.c
index a8ceef8d1..a8bb4a06b 100644
--- a/kernel/sound/oss/msnd_pinnacle.c
+++ b/kernel/sound/oss/msnd_pinnacle.c
@@ -1288,8 +1288,7 @@ static int __init calibrate_adc(WORD srate)
& ~0x0001, dev.SMA + SMA_wCurrHostStatusFlags);
if (msnd_send_word(&dev, 0, 0, HDEXAR_CAL_A_TO_D) == 0 &&
chk_send_dsp_cmd(&dev, HDEX_AUX_REQ) == 0) {
- __set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 3);
+ schedule_timeout_interruptible(HZ / 3);
return 0;
}
printk(KERN_WARNING LOGNAME ": ADC calibration failed\n");
diff --git a/kernel/sound/oss/sb_audio.c b/kernel/sound/oss/sb_audio.c
index 048439a16..dc91072f4 100644
--- a/kernel/sound/oss/sb_audio.c
+++ b/kernel/sound/oss/sb_audio.c
@@ -102,12 +102,8 @@ void sb_audio_close(int dev)
if(devc->duplex
&& !devc->fullduplex
&& (devc->opened & OPEN_READ) && (devc->opened & OPEN_WRITE))
- {
- struct dma_buffparms *dmap_temp;
- dmap_temp = audio_devs[dev]->dmap_out;
- audio_devs[dev]->dmap_out = audio_devs[dev]->dmap_in;
- audio_devs[dev]->dmap_in = dmap_temp;
- }
+ swap(audio_devs[dev]->dmap_out, audio_devs[dev]->dmap_in);
+
audio_devs[dev]->dmap_out->dma = devc->dma8;
audio_devs[dev]->dmap_in->dma = ( devc->duplex ) ?
devc->dma16 : devc->dma8;