Commit 7aba06f0 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] fix hostess driver for 2.5

parent 06e85681
...@@ -284,9 +284,11 @@ static struct sv11_device *sv11_init(int iobase, int irq) ...@@ -284,9 +284,11 @@ static struct sv11_device *sv11_init(int iobase, int irq)
goto dmafail; goto dmafail;
} }
} }
save_flags(flags);
cli(); /* Kill our private IRQ line the hostess can end up chattering
until the configuration is set */
disable_irq(irq);
/* /*
* Begin normal initialise * Begin normal initialise
*/ */
...@@ -294,7 +296,7 @@ static struct sv11_device *sv11_init(int iobase, int irq) ...@@ -294,7 +296,7 @@ static struct sv11_device *sv11_init(int iobase, int irq)
if(z8530_init(dev)!=0) if(z8530_init(dev)!=0)
{ {
printk(KERN_ERR "Z8530 series device not found.\n"); printk(KERN_ERR "Z8530 series device not found.\n");
restore_flags(flags); enable_irq(irq);
goto dmafail2; goto dmafail2;
} }
z8530_channel_load(&dev->chanB, z8530_dead_port); z8530_channel_load(&dev->chanB, z8530_dead_port);
...@@ -303,8 +305,8 @@ static struct sv11_device *sv11_init(int iobase, int irq) ...@@ -303,8 +305,8 @@ static struct sv11_device *sv11_init(int iobase, int irq)
else else
z8530_channel_load(&dev->chanA, z8530_hdlc_kilostream_85230); z8530_channel_load(&dev->chanA, z8530_hdlc_kilostream_85230);
restore_flags(flags); enable_irq(irq);
/* /*
* Now we can take the IRQ * Now we can take the IRQ
...@@ -399,7 +401,7 @@ static struct sv11_device *sv11_unit; ...@@ -399,7 +401,7 @@ static struct sv11_device *sv11_unit;
int init_module(void) int init_module(void)
{ {
printk(KERN_INFO "SV-11 Z85230 Synchronous Driver v 0.02.\n"); printk(KERN_INFO "SV-11 Z85230 Synchronous Driver v 0.03.\n");
printk(KERN_INFO "(c) Copyright 2001, Red Hat Inc.\n"); printk(KERN_INFO "(c) Copyright 2001, Red Hat Inc.\n");
if((sv11_unit=sv11_init(io,irq))==NULL) if((sv11_unit=sv11_init(io,irq))==NULL)
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment