diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-07-31 15:08:32 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-06 09:39:55 -0400 |
| commit | 5664daa1c1fa250dd7f6b336278b0402638e8edc (patch) | |
| tree | a128ca1e8ead396c43bb50827ef989cdd34f5ca9 /sound/isa/sgalaxy.c | |
| parent | 811585e9d1769d6e282852fc0675735209547ca0 (diff) | |
ALSA: wss_lib: use wss mixer code instead of ad1848 one
Use the wss mixer code and kill the ad1848 mixer code.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/isa/sgalaxy.c')
| -rw-r--r-- | sound/isa/sgalaxy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c index 5894b2d4db64..e4f06de3480c 100644 --- a/sound/isa/sgalaxy.c +++ b/sound/isa/sgalaxy.c | |||
| @@ -277,8 +277,9 @@ static int __devinit snd_sgalaxy_probe(struct device *devptr, unsigned int dev) | |||
| 277 | snd_printdd(PFX "error creating new ad1848 PCM device\n"); | 277 | snd_printdd(PFX "error creating new ad1848 PCM device\n"); |
| 278 | goto _err; | 278 | goto _err; |
| 279 | } | 279 | } |
| 280 | if ((err = snd_ad1848_mixer(chip)) < 0) { | 280 | err = snd_wss_mixer(chip); |
| 281 | snd_printdd(PFX "error creating new ad1848 mixer\n"); | 281 | if (err < 0) { |
| 282 | snd_printdd(PFX "error creating new WSS mixer\n"); | ||
| 282 | goto _err; | 283 | goto _err; |
| 283 | } | 284 | } |
| 284 | if ((err = snd_sgalaxy_mixer(chip)) < 0) { | 285 | if ((err = snd_sgalaxy_mixer(chip)) < 0) { |