aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRisto Suominen <Risto.Suominen@gmail.com>2009-01-20 15:01:14 -0500
committerTakashi Iwai <tiwai@suse.de>2009-03-09 09:58:07 -0400
commit573934bc038b0f47d17a5608e74b79dcd7c191ea (patch)
tree91bd945f1c112329fb0ec115356761ea6c34b427
parentb0a8a8fd1b3bd6fbbb4b599191b859d41e12a002 (diff)
ALSA: powermac - Correct volume controls for PowerBook G3 Lombard
Correct volume controls for PowerBook G3 Lombard (Screamer). Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/ppc/awacs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 0258ccb8f431..d89c23e135dc 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -773,6 +773,7 @@ static void snd_pmac_awacs_resume(struct snd_pmac *chip)
773#define IS_IMAC2 (machine_is_compatible("PowerMac2,2") \ 773#define IS_IMAC2 (machine_is_compatible("PowerMac2,2") \
774 || machine_is_compatible("PowerMac4,1")) 774 || machine_is_compatible("PowerMac4,1"))
775#define IS_G4AGP (machine_is_compatible("PowerMac3,1")) 775#define IS_G4AGP (machine_is_compatible("PowerMac3,1"))
776#define IS_LOMBARD (machine_is_compatible("PowerBook1,1"))
776 777
777static int imac1, imac2; 778static int imac1, imac2;
778 779
@@ -862,6 +863,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
862 int pm5500 = IS_PM5500; 863 int pm5500 = IS_PM5500;
863 int beige = IS_BEIGE; 864 int beige = IS_BEIGE;
864 int g4agp = IS_G4AGP; 865 int g4agp = IS_G4AGP;
866 int lombard = IS_LOMBARD;
865 int imac; 867 int imac;
866 int err, vol; 868 int err, vol;
867 869
@@ -972,7 +974,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
972 err = build_mixers(chip, 974 err = build_mixers(chip,
973 ARRAY_SIZE(snd_pmac_screamer_mixers_beige), 975 ARRAY_SIZE(snd_pmac_screamer_mixers_beige),
974 snd_pmac_screamer_mixers_beige); 976 snd_pmac_screamer_mixers_beige);
975 else if (imac) 977 else if (imac || lombard)
976 err = build_mixers(chip, 978 err = build_mixers(chip,
977 ARRAY_SIZE(snd_pmac_screamer_mixers_imac), 979 ARRAY_SIZE(snd_pmac_screamer_mixers_imac),
978 snd_pmac_screamer_mixers_imac); 980 snd_pmac_screamer_mixers_imac);
@@ -986,7 +988,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
986 snd_pmac_awacs_mixers_pmac); 988 snd_pmac_awacs_mixers_pmac);
987 if (err < 0) 989 if (err < 0)
988 return err; 990 return err;
989 chip->master_sw_ctl = snd_ctl_new1((pm7500 || imac || g4agp) 991 chip->master_sw_ctl = snd_ctl_new1((pm7500 || imac || g4agp || lombard)
990 ? &snd_pmac_awacs_master_sw_imac 992 ? &snd_pmac_awacs_master_sw_imac
991 : &snd_pmac_awacs_master_sw, chip); 993 : &snd_pmac_awacs_master_sw, chip);
992 err = snd_ctl_add(chip->card, chip->master_sw_ctl); 994 err = snd_ctl_add(chip->card, chip->master_sw_ctl);