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

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

[Nuno Monteiro]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

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

[-- Attachment #2: sb_mixer.c.diff --]
[-- Type: text/plain, Size: 733 bytes --]

--- 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)
 

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

[Adrian Bunk]

On Fri, Jan 17, 2003 at 04:17:52PM +0000, Nuno Monteiro wrote:

> 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 :)

This file is OK in 2.5.59. Could it be that your editor or another 
program you use broke it?

> Regards,
> 
> 
> 		Nuno

> --- 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)
>  


cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed