diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-06-10 22:52:10 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-06-10 22:52:10 +1000 |
| commit | 66dd07b88a1c9d446f32253da606b87324fa620e (patch) | |
| tree | 4e0971bdd543585c7ab46716ae808a7fd82f9c35 /arch/um/drivers/chan_kern.c | |
| parent | f52c44cd27b4a0be37ef97f0466e4095ebebef3f (diff) | |
| parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff) | |
Merge commit 'v3.5-rc2' into next
Diffstat (limited to 'arch/um/drivers/chan_kern.c')
| -rw-r--r-- | arch/um/drivers/chan_kern.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c index ca4c7ebfd0aa..45e248c2f43c 100644 --- a/arch/um/drivers/chan_kern.c +++ b/arch/um/drivers/chan_kern.c @@ -8,6 +8,7 @@ #include <linux/tty_flip.h> #include "chan.h" #include "os.h" +#include "irq_kern.h" #ifdef CONFIG_NOCONFIG_CHAN static void *not_configged_init(char *str, int device, @@ -213,9 +214,9 @@ void free_irqs(void) chan = list_entry(ele, struct chan, free_list); if (chan->input && chan->enabled) - free_irq(chan->line->driver->read_irq, chan); + um_free_irq(chan->line->driver->read_irq, chan); if (chan->output && chan->enabled) - free_irq(chan->line->driver->write_irq, chan); + um_free_irq(chan->line->driver->write_irq, chan); chan->enabled = 0; } } @@ -234,9 +235,9 @@ static void close_one_chan(struct chan *chan, int delay_free_irq) } else { if (chan->input && chan->enabled) - free_irq(chan->line->driver->read_irq, chan); + um_free_irq(chan->line->driver->read_irq, chan); if (chan->output && chan->enabled) - free_irq(chan->line->driver->write_irq, chan); + um_free_irq(chan->line->driver->write_irq, chan); chan->enabled = 0; } if (chan->ops->close != NULL) |