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
Merge branch 'topic/intel8x0' into for-linus
[safe/jmp/linux-2.6]
/
sound
/
pci
/
intel8x0.c
diff --git
a/sound/pci/intel8x0.c
b/sound/pci/intel8x0.c
index
0f7d129
..
5764881
100644
(file)
--- a/
sound/pci/intel8x0.c
+++ b/
sound/pci/intel8x0.c
@@
-617,7
+617,7
@@
static int snd_intel8x0_ali_codec_semaphore(struct intel8x0 *chip)
int time = 100;
if (chip->buggy_semaphore)
return 0; /* just ignore ... */
int time = 100;
if (chip->buggy_semaphore)
return 0; /* just ignore ... */
- while (
time--
&& (igetdword(chip, ICHREG(ALI_CAS)) & ALI_CAS_SEM_BUSY))
+ while (
--time
&& (igetdword(chip, ICHREG(ALI_CAS)) & ALI_CAS_SEM_BUSY))
udelay(1);
if (! time && ! chip->in_ac97_init)
snd_printk(KERN_WARNING "ali_codec_semaphore timeout\n");
udelay(1);
if (! time && ! chip->in_ac97_init)
snd_printk(KERN_WARNING "ali_codec_semaphore timeout\n");
@@
-3097,9
+3097,9
@@
static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
int err;
struct shortname_table *name;
int err;
struct shortname_table *name;
-
card = snd_card_new(index, id, THIS_MODULE, 0
);
- if (
card == NULL
)
- return
-ENOMEM
;
+
err = snd_card_create(index, id, THIS_MODULE, 0, &card
);
+ if (
err < 0
)
+ return
err
;
if (spdif_aclink < 0)
spdif_aclink = check_default_spdif_aclink(pci);
if (spdif_aclink < 0)
spdif_aclink = check_default_spdif_aclink(pci);