projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
sound
/
pci
/
via82xx_modem.c
diff --git
a/sound/pci/via82xx_modem.c
b/sound/pci/via82xx_modem.c
index
b338e15
..
57fb9ae
100644
(file)
--- a/
sound/pci/via82xx_modem.c
+++ b/
sound/pci/via82xx_modem.c
@@
-3,7
+3,7
@@
*
* VT82C686A/B/C, VT8233A/C, VT8235
*
*
* VT82C686A/B/C, VT8233A/C, VT8235
*
- * Copyright (c) 2000 Jaroslav Kysela <perex@
suse
.cz>
+ * Copyright (c) 2000 Jaroslav Kysela <perex@
perex
.cz>
* Tjeerd.Mulder <Tjeerd.Mulder@fujitsu-siemens.com>
* 2002 Takashi Iwai <tiwai@suse.de>
*
* Tjeerd.Mulder <Tjeerd.Mulder@fujitsu-siemens.com>
* 2002 Takashi Iwai <tiwai@suse.de>
*
@@
-50,7
+50,7
@@
#define POINTER_DEBUG
#endif
#define POINTER_DEBUG
#endif
-MODULE_AUTHOR("Jaroslav Kysela <perex@
suse
.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@
perex
.cz>");
MODULE_DESCRIPTION("VIA VT82xx modem");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{VIA,VT82C686A/B/C modem,pci}}");
MODULE_DESCRIPTION("VIA VT82xx modem");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{VIA,VT82C686A/B/C modem,pci}}");
@@
-1001,7
+1001,7
@@
static int snd_via82xx_chip_init(struct via82xx_modem *chip)
chip->ac97_secondary = 1;
goto __ac97_ok2;
}
chip->ac97_secondary = 1;
goto __ac97_ok2;
}
- schedule_timeout_interruptible(1);
+ schedule_timeout_
un
interruptible(1);
} while (time_before(jiffies, end_time));
/* This is ok, the most of motherboards have only one codec */
} while (time_before(jiffies, end_time));
/* This is ok, the most of motherboards have only one codec */
@@
-1162,7
+1162,6
@@
static int __devinit snd_via82xx_probe(struct pci_dev *pci,
{
struct snd_card *card;
struct via82xx_modem *chip;
{
struct snd_card *card;
struct via82xx_modem *chip;
- unsigned char revision;
int chip_type = 0, card_type;
unsigned int i;
int err;
int chip_type = 0, card_type;
unsigned int i;
int err;
@@
-1172,7
+1171,6
@@
static int __devinit snd_via82xx_probe(struct pci_dev *pci,
return -ENOMEM;
card_type = pci_id->driver_data;
return -ENOMEM;
card_type = pci_id->driver_data;
- pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
switch (card_type) {
case TYPE_CARD_VIA82XX_MODEM:
strcpy(card->driver, "VIA82XX-MODEM");
switch (card_type) {
case TYPE_CARD_VIA82XX_MODEM:
strcpy(card->driver, "VIA82XX-MODEM");
@@
-1184,7
+1182,7
@@
static int __devinit snd_via82xx_probe(struct pci_dev *pci,
goto __error;
}
goto __error;
}
- if ((err = snd_via82xx_create(card, pci, chip_type, revision,
+ if ((err = snd_via82xx_create(card, pci, chip_type,
pci->
revision,
ac97_clock, &chip)) < 0)
goto __error;
card->private_data = chip;
ac97_clock, &chip)) < 0)
goto __error;
card->private_data = chip;