diff options
Diffstat (limited to 'arch/um/drivers/line.c')
-rw-r--r-- | arch/um/drivers/line.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index acfd0e0fd0c9..ac9d25c8dc01 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c | |||
@@ -362,18 +362,18 @@ static irqreturn_t line_write_interrupt(int irq, void *data) | |||
362 | int line_setup_irq(int fd, int input, int output, struct line *line, void *data) | 362 | int line_setup_irq(int fd, int input, int output, struct line *line, void *data) |
363 | { | 363 | { |
364 | const struct line_driver *driver = line->driver; | 364 | const struct line_driver *driver = line->driver; |
365 | int err = 0, flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM; | 365 | int err = 0; |
366 | 366 | ||
367 | if (input) | 367 | if (input) |
368 | err = um_request_irq(driver->read_irq, fd, IRQ_READ, | 368 | err = um_request_irq(driver->read_irq, fd, IRQ_READ, |
369 | line_interrupt, flags, | 369 | line_interrupt, IRQF_SHARED, |
370 | driver->read_irq_name, data); | 370 | driver->read_irq_name, data); |
371 | if (err) | 371 | if (err) |
372 | return err; | 372 | return err; |
373 | if (output) | 373 | if (output) |
374 | err = um_request_irq(driver->write_irq, fd, IRQ_WRITE, | 374 | err = um_request_irq(driver->write_irq, fd, IRQ_WRITE, |
375 | line_write_interrupt, flags, | 375 | line_write_interrupt, IRQF_SHARED, |
376 | driver->write_irq_name, data); | 376 | driver->write_irq_name, data); |
377 | return err; | 377 | return err; |
378 | } | 378 | } |
379 | 379 | ||
@@ -779,8 +779,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty, | |||
779 | .stack = stack }); | 779 | .stack = stack }); |
780 | 780 | ||
781 | if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt, | 781 | if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt, |
782 | IRQF_SHARED | IRQF_SAMPLE_RANDOM, | 782 | IRQF_SHARED, "winch", winch) < 0) { |
783 | "winch", winch) < 0) { | ||
784 | printk(KERN_ERR "register_winch_irq - failed to register " | 783 | printk(KERN_ERR "register_winch_irq - failed to register " |
785 | "IRQ\n"); | 784 | "IRQ\n"); |
786 | goto out_free; | 785 | goto out_free; |