um: call free_irq() only on enabled channels

[pandora-kernel.git] / arch / um / drivers / chan_kern.c

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 6e51424..25e1965 100644 (file)
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -210,9 +210,9 @@ void free_irqs(void)
        list_for_each(ele, &list) {
                chan = list_entry(ele, struct chan, free_list);
 
-               if (chan->input)
+               if (chan->input && chan->enabled)
                        free_irq(chan->line->driver->read_irq, chan);
-               if (chan->output)
+               if (chan->output && chan->enabled)
                        free_irq(chan->line->driver->write_irq, chan);
                chan->enabled = 0;
        }
@@ -231,9 +231,9 @@ static void close_one_chan(struct chan *chan, int delay_free_irq)
                spin_unlock_irqrestore(&irqs_to_free_lock, flags);
        }
        else {
-               if (chan->input)
+               if (chan->input && chan->enabled)
                        free_irq(chan->line->driver->read_irq, chan);
-               if (chan->output)
+               if (chan->output && chan->enabled)
                        free_irq(chan->line->driver->write_irq, chan);
                chan->enabled = 0;
        }