git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934
[safe/jmp/linux-2.6]
/
sound
/
pci
/
ens1370.c
diff --git
a/sound/pci/ens1370.c
b/sound/pci/ens1370.c
index
fbf1124
..
18f4d1e
100644
(file)
--- a/
sound/pci/ens1370.c
+++ b/
sound/pci/ens1370.c
@@
-522,7
+522,7
@@
static unsigned int snd_es1371_wait_src_ready(struct ensoniq * ensoniq)
return r;
cond_resched();
}
return r;
cond_resched();
}
- snd_printk(KERN_ERR "wait s
ource
ready timeout 0x%lx [0x%x]\n",
+ snd_printk(KERN_ERR "wait s
rc
ready timeout 0x%lx [0x%x]\n",
ES_REG(ensoniq, 1371_SMPRATE), r);
return 0;
}
ES_REG(ensoniq, 1371_SMPRATE), r);
return 0;
}
@@
-584,7
+584,8
@@
static void snd_es1370_codec_write(struct snd_ak4531 *ak4531,
unsigned long end_time = jiffies + HZ / 10;
#if 0
unsigned long end_time = jiffies + HZ / 10;
#if 0
- printk("CODEC WRITE: reg = 0x%x, val = 0x%x (0x%x), creg = 0x%x\n",
+ printk(KERN_DEBUG
+ "CODEC WRITE: reg = 0x%x, val = 0x%x (0x%x), creg = 0x%x\n",
reg, val, ES_1370_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1370_CODEC));
#endif
do {
reg, val, ES_1370_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1370_CODEC));
#endif
do {
@@
-1629,6
+1630,7
@@
static int __devinit snd_ensoniq_1371_mixer(struct ensoniq *ensoniq,
memset(&ac97, 0, sizeof(ac97));
ac97.private_data = ensoniq;
ac97.private_free = snd_ensoniq_mixer_free_ac97;
memset(&ac97, 0, sizeof(ac97));
ac97.private_data = ensoniq;
ac97.private_free = snd_ensoniq_mixer_free_ac97;
+ ac97.pci = ensoniq->pci;
ac97.scaps = AC97_SCAP_AUDIO;
if ((err = snd_ac97_mixer(pbus, &ac97, &ensoniq->u.es1371.ac97)) < 0)
return err;
ac97.scaps = AC97_SCAP_AUDIO;
if ((err = snd_ac97_mixer(pbus, &ac97, &ensoniq->u.es1371.ac97)) < 0)
return err;
@@
-2408,9
+2410,9
@@
static int __devinit snd_audiopci_probe(struct pci_dev *pci,
return -ENOENT;
}
return -ENOENT;
}
-
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0
);
- if (
card == NULL
)
- return
-ENOMEM
;
+
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card
);
+ if (
err < 0
)
+ return
err
;
if ((err = snd_ensoniq_create(card, pci, &ensoniq)) < 0) {
snd_card_free(card);
if ((err = snd_ensoniq_create(card, pci, &ensoniq)) < 0) {
snd_card_free(card);