git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
pci
/
cs46xx
/
cs46xx.c
diff --git
a/sound/pci/cs46xx/cs46xx.c
b/sound/pci/cs46xx/cs46xx.c
index
25d6466
..
c590602
100644
(file)
--- a/
sound/pci/cs46xx/cs46xx.c
+++ b/
sound/pci/cs46xx/cs46xx.c
@@
-78,8
+78,8
@@
static int __devinit snd_card_cs46xx_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id)
{
static int dev;
const struct pci_device_id *pci_id)
{
static int dev;
- s
nd_card_t
*card;
-
cs46xx_t
*chip;
+ s
truct snd_card
*card;
+
struct snd_cs46xx
*chip;
int err;
if (dev >= SNDRV_CARDS)
int err;
if (dev >= SNDRV_CARDS)
@@
-98,6
+98,7
@@
static int __devinit snd_card_cs46xx_probe(struct pci_dev *pci,
snd_card_free(card);
return err;
}
snd_card_free(card);
return err;
}
+ card->private_data = chip;
chip->accept_valid = mmap_valid[dev];
if ((err = snd_cs46xx_pcm(chip, 0, NULL)) < 0) {
snd_card_free(card);
chip->accept_valid = mmap_valid[dev];
if ((err = snd_cs46xx_pcm(chip, 0, NULL)) < 0) {
snd_card_free(card);
@@
-113,7
+114,7
@@
static int __devinit snd_card_cs46xx_probe(struct pci_dev *pci,
return err;
}
#endif
return err;
}
#endif
- if ((err = snd_cs46xx_mixer(chip)) < 0) {
+ if ((err = snd_cs46xx_mixer(chip
, 2
)) < 0) {
snd_card_free(card);
return err;
}
snd_card_free(card);
return err;
}
@@
-166,12
+167,15
@@
static struct pci_driver driver = {
.id_table = snd_cs46xx_ids,
.probe = snd_card_cs46xx_probe,
.remove = __devexit_p(snd_card_cs46xx_remove),
.id_table = snd_cs46xx_ids,
.probe = snd_card_cs46xx_probe,
.remove = __devexit_p(snd_card_cs46xx_remove),
- SND_PCI_PM_CALLBACKS
+#ifdef CONFIG_PM
+ .suspend = snd_cs46xx_suspend,
+ .resume = snd_cs46xx_resume,
+#endif
};
static int __init alsa_card_cs46xx_init(void)
{
};
static int __init alsa_card_cs46xx_init(void)
{
- return pci_
module_init
(&driver);
+ return pci_
register_driver
(&driver);
}
static void __exit alsa_card_cs46xx_exit(void)
}
static void __exit alsa_card_cs46xx_exit(void)