projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.26-rc8' into x86/mce
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
sound
/
pci
/
via82xx_modem.c
diff --git
a/sound/pci/via82xx_modem.c
b/sound/pci/via82xx_modem.c
index 3aa9d31d99927cd40a3ea95139eabfa2f26eeceb..31f64ee398820c62ffb8c9b51318a2c4e122e9b0 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>
*
@@
-31,7
+31,6
@@
* modems.
*/
* modems.
*/
-#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
@@
-50,7
+49,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}}");
@@
-1076,7
+1075,7
@@
static int snd_via82xx_free(struct via82xx_modem *chip)
/* disable interrupts */
for (i = 0; i < chip->num_devs; i++)
snd_via82xx_channel_reset(chip, &chip->devs[i]);
/* disable interrupts */
for (i = 0; i < chip->num_devs; i++)
snd_via82xx_channel_reset(chip, &chip->devs[i]);
- synchronize_irq(chip->irq);
+
__end_hw:
if (chip->irq >= 0)
free_irq(chip->irq, chip);
__end_hw:
if (chip->irq >= 0)
free_irq(chip->irq, chip);