aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/sgalaxy.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/sgalaxy.c')
-rw-r--r--sound/isa/sgalaxy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c
index a07274ecb149..879c00c566ba 100644
--- a/sound/isa/sgalaxy.c
+++ b/sound/isa/sgalaxy.c
@@ -180,7 +180,7 @@ AD1848_DOUBLE("Aux Playback Switch", 0, SGALAXY_AUXC_LEFT, SGALAXY_AUXC_RIGHT, 7
180AD1848_DOUBLE("Aux Playback Volume", 0, SGALAXY_AUXC_LEFT, SGALAXY_AUXC_RIGHT, 0, 0, 31, 0) 180AD1848_DOUBLE("Aux Playback Volume", 0, SGALAXY_AUXC_LEFT, SGALAXY_AUXC_RIGHT, 0, 0, 31, 0)
181}; 181};
182 182
183static int __devinit snd_sgalaxy_mixer(struct snd_ad1848 *chip) 183static int __devinit snd_sgalaxy_mixer(struct snd_wss *chip)
184{ 184{
185 struct snd_card *card = chip->card; 185 struct snd_card *card = chip->card;
186 struct snd_ctl_elem_id id1, id2; 186 struct snd_ctl_elem_id id1, id2;
@@ -237,7 +237,7 @@ static int __devinit snd_sgalaxy_probe(struct device *devptr, unsigned int dev)
237 static int possible_dmas[] = {1, 3, 0, -1}; 237 static int possible_dmas[] = {1, 3, 0, -1};
238 int err, xirq, xdma1; 238 int err, xirq, xdma1;
239 struct snd_card *card; 239 struct snd_card *card;
240 struct snd_ad1848 *chip; 240 struct snd_wss *chip;
241 241
242 card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); 242 card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
243 if (card == NULL) 243 if (card == NULL)
@@ -312,7 +312,7 @@ static int snd_sgalaxy_suspend(struct device *pdev, unsigned int n,
312 pm_message_t state) 312 pm_message_t state)
313{ 313{
314 struct snd_card *card = dev_get_drvdata(pdev); 314 struct snd_card *card = dev_get_drvdata(pdev);
315 struct snd_ad1848 *chip = card->private_data; 315 struct snd_wss *chip = card->private_data;
316 316
317 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 317 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
318 chip->suspend(chip); 318 chip->suspend(chip);
@@ -322,7 +322,7 @@ static int snd_sgalaxy_suspend(struct device *pdev, unsigned int n,
322static int snd_sgalaxy_resume(struct device *pdev, unsigned int n) 322static int snd_sgalaxy_resume(struct device *pdev, unsigned int n)
323{ 323{
324 struct snd_card *card = dev_get_drvdata(pdev); 324 struct snd_card *card = dev_get_drvdata(pdev);
325 struct snd_ad1848 *chip = card->private_data; 325 struct snd_wss *chip = card->private_data;
326 326
327 chip->resume(chip); 327 chip->resume(chip);
328 snd_ad1848_out(chip, SGALAXY_AUXC_LEFT, chip->image[SGALAXY_AUXC_LEFT]); 328 snd_ad1848_out(chip, SGALAXY_AUXC_LEFT, chip->image[SGALAXY_AUXC_LEFT]);