[BUG/PATCH] OSS/sb_mixer.c is broken on 2.5.59

Nuno Monteiro (nuno@itsari.org)
Fri, 17 Jan 2003 16:17:52 +0000


This is a MIME-formatted message. If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-24195-1042820517-0001-2
Content-Type: text/plain; format=flowed; charset=iso-8859-15
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
X-Mime-Autoconverted: from 8bit to 7bit by courier 0.39

Hi,

I know OSS is not all that supported, but it has been mostly working for
the past 2.5 revisions. However, 2.5.59 broke it. Here is the fix, it
allows sound/oss/sb_mixer.c to comple again -- I havent booted it yet,
but its trivial enough to spot it from a mile away :)

Regards,

Nuno

--=_courier-24195-1042820517-0001-2
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="sb_mixer.c.diff"
X-Mime-Autoconverted: from 8bit to 7bit by courier 0.39

--- linux-2.5.59/sound/oss/sb_mixer.c.orig Fri Jan 17 15:40:41 2003
+++ linux-2.5.59/sound/oss/sb_mixer.c Fri Jan 17 15:40:55 2003
@@ -45,7 +45,7 @@
SOUND_MASK_TREBLE|SOUND_MASK_SPEAKER )

#define SB16_RECORDING_DEVICES (SOUND_MASK_SYNTH | \
- SOUND_MASK_LINE | \ SOUND_MASK_MIC | \
+ SOUND_MASK_LINE | SOUND_MASK_MIC | \
SOUND_MASK_CD)

#define SB16_OUTFILTER_DEVICES (SOUND_MASK_LINE | SOUND_MASK_MIC | \
@@ -55,7 +55,7 @@
SOUND_MASK_SPEAKER | \
SOUND_MASK_LINE | SOUND_MASK_MIC | \
SOUND_MASK_CD | SOUND_MASK_IGAIN | \
- SOUND_MASK_OGAIN | \ SOUND_MASK_VOLUME | \
+ SOUND_MASK_OGAIN | SOUND_MASK_VOLUME | \
SOUND_MASK_BASS | SOUND_MASK_TREBLE | \
SOUND_MASK_IMIX)

--=_courier-24195-1042820517-0001-2--