Messages in this thread Patch in this message | | | From | Keith Owens <> | Subject | ossfree version 3.8-beta4 patches, 2.1.24 | Date | Thu, 30 Jan 1997 22:38:00 +1100 |
| |
diff -ur linux-2.1.24/drivers/sound/dmabuf.c linux/drivers/sound/dmabuf.c --- linux-2.1.24/drivers/sound/dmabuf.c Wed Jan 29 20:00:54 1997 +++ linux/drivers/sound/dmabuf.c Thu Jan 30 21:49:28 1997 @@ -1380,7 +1380,7 @@ cli (); in_sleep_flag[dev].opts = WK_SLEEP; - select_wait (&in_sleeper[dev], wait); + poll_wait (&in_sleeper[dev], wait); restore_flags (flags); return 0; } @@ -1408,7 +1408,7 @@ cli (); in_sleep_flag[dev].opts = WK_SLEEP; - select_wait (&in_sleeper[dev], wait); + poll_wait (&in_sleeper[dev], wait); restore_flags (flags); return 0; } @@ -1427,7 +1427,7 @@ cli (); out_sleep_flag[dev].opts = WK_SLEEP; - select_wait (&out_sleeper[dev], wait); + poll_wait (&out_sleeper[dev], wait); restore_flags (flags); return 0; } @@ -1448,7 +1448,7 @@ cli (); out_sleep_flag[dev].opts = WK_SLEEP; - select_wait (&out_sleeper[dev], wait); + poll_wait (&out_sleeper[dev], wait); restore_flags (flags); return 0; } diff -ur linux-2.1.24/drivers/sound/lowlevel/awe_wave.c linux/drivers/sound/lowlevel/awe_wave.c --- linux-2.1.24/drivers/sound/lowlevel/awe_wave.c Wed Jan 29 19:54:14 1997 +++ linux/drivers/sound/lowlevel/awe_wave.c Thu Jan 30 21:42:44 1997 @@ -423,6 +423,7 @@ static struct synth_operations awe_operations = { + "AWE_WAVE", &awe_info, 0, SYNTH_TYPE_SAMPLE, @@ -3368,7 +3369,7 @@ awe_poke_dw(AWE_CPF(i), 0x40000000); awe_poke_dw(AWE_PSST(i), 0); awe_poke_dw(AWE_CSL(i), 0); - if (k & 1) /* DMA write */ + if (i & 1) /* DMA write */ awe_poke_dw(AWE_CCCA(i), 0x06000000); else /* DMA read */ awe_poke_dw(AWE_CCCA(i), 0x04000000); diff -ur linux-2.1.24/drivers/sound/midibuf.c linux/drivers/sound/midibuf.c --- linux-2.1.24/drivers/sound/midibuf.c Wed Jan 29 20:01:02 1997 +++ linux/drivers/sound/midibuf.c Thu Jan 30 21:50:07 1997 @@ -509,7 +509,7 @@ { input_sleep_flag[dev].opts = WK_SLEEP; - select_wait (&input_sleeper[dev], wait); + poll_wait (&input_sleeper[dev], wait); return 0; } return 1; @@ -520,7 +520,7 @@ { midi_sleep_flag[dev].opts = WK_SLEEP; - select_wait (&midi_sleeper[dev], wait); + poll_wait (&midi_sleeper[dev], wait); return 0; } return 1; diff -ur linux-2.1.24/drivers/sound/sequencer.c linux/drivers/sound/sequencer.c --- linux-2.1.24/drivers/sound/sequencer.c Wed Jan 29 20:01:14 1997 +++ linux/drivers/sound/sequencer.c Thu Jan 30 21:50:11 1997 @@ -1824,7 +1824,7 @@ { midi_sleep_flag.opts = WK_SLEEP; - select_wait (&midi_sleeper, wait); + poll_wait (&midi_sleeper, wait); restore_flags (flags); return 0; } @@ -1839,7 +1839,7 @@ { seq_sleep_flag.opts = WK_SLEEP; - select_wait (&seq_sleeper, wait); + poll_wait (&seq_sleeper, wait); restore_flags (flags); return 0; }
| |