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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
drivers
/
serial-u16550.c
diff --git
a/sound/drivers/serial-u16550.c
b/sound/drivers/serial-u16550.c
index
112ddf7
..
74028b2
100644
(file)
--- a/
sound/drivers/serial-u16550.c
+++ b/
sound/drivers/serial-u16550.c
@@
-292,7
+292,7
@@
static void snd_uart16550_io_loop(snd_uart16550_t * uart)
* Note that some devices need OUT2 to be set before they will generate
* interrupts at all. (Possibly tied to an internal pull-up on CTS?)
*/
* Note that some devices need OUT2 to be set before they will generate
* interrupts at all. (Possibly tied to an internal pull-up on CTS?)
*/
-static irqreturn_t snd_uart16550_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t snd_uart16550_interrupt(int irq, void *dev_id)
{
snd_uart16550_t *uart;
{
snd_uart16550_t *uart;
@@
-789,12
+789,13
@@
static int __init snd_uart16550_create(struct snd_card *card,
if ((err = snd_uart16550_detect(uart)) <= 0) {
printk(KERN_ERR "no UART detected at 0x%lx\n", iobase);
if ((err = snd_uart16550_detect(uart)) <= 0) {
printk(KERN_ERR "no UART detected at 0x%lx\n", iobase);
+ snd_uart16550_free(uart);
return -ENODEV;
}
if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
if (request_irq(irq, snd_uart16550_interrupt,
return -ENODEV;
}
if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
if (request_irq(irq, snd_uart16550_interrupt,
-
SA_INTERRUPT
, "Serial MIDI", (void *) uart)) {
+
IRQF_DISABLED
, "Serial MIDI", (void *) uart)) {
snd_printk("irq %d busy. Using Polling.\n", irq);
} else {
uart->irq = irq;
snd_printk("irq %d busy. Using Polling.\n", irq);
} else {
uart->irq = irq;
@@
-989,13
+990,17
@@
static int __init alsa_card_serial_init(void)
return err;
cards = 0;
return err;
cards = 0;
- for (i = 0; i < SNDRV_CARDS
&& enable[i]
; i++) {
+ for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
struct platform_device *device;
+ if (! enable[i])
+ continue;
device = platform_device_register_simple(SND_SERIAL_DRIVER,
i, NULL, 0);
device = platform_device_register_simple(SND_SERIAL_DRIVER,
i, NULL, 0);
- if (IS_ERR(device)) {
- err = PTR_ERR(device);
- goto errout;
+ if (IS_ERR(device))
+ continue;
+ if (!platform_get_drvdata(device)) {
+ platform_device_unregister(device);
+ continue;
}
devices[i] = device;
cards++;
}
devices[i] = device;
cards++;
@@
-1004,14
+1009,10
@@
static int __init alsa_card_serial_init(void)
#ifdef MODULE
printk(KERN_ERR "serial midi soundcard not found or device busy\n");
#endif
#ifdef MODULE
printk(KERN_ERR "serial midi soundcard not found or device busy\n");
#endif
-
err = -ENODEV
;
-
goto errout
;
+
snd_serial_unregister_all()
;
+
return -ENODEV
;
}
return 0;
}
return 0;
-
- errout:
- snd_serial_unregister_all();
- return err;
}
static void __exit alsa_card_serial_exit(void)
}
static void __exit alsa_card_serial_exit(void)