| From da08965ac0fcfbb4ceb88a92cd2adabe831bffc0 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 6 Dec 2013 10:59:13 +0100 |
| Subject: serial: sh-sci: Remove duplicate interrupt check in verify port op |
| |
| The driver checks if the interrupt number is greater than nr_irqs and |
| returns an error in that case. The same check is already performed by |
| the caller, remove it. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit b5e17b71c6b2ff284b4018e272e18876ccfa9b2c) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/tty/serial/sh-sci.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c |
| index 94e878cacd50..fa3a9422b8c7 100644 |
| --- a/drivers/tty/serial/sh-sci.c |
| +++ b/drivers/tty/serial/sh-sci.c |
| @@ -2120,7 +2120,7 @@ static int sci_verify_port(struct uart_port *port, struct serial_struct *ser) |
| { |
| struct sci_port *s = to_sci_port(port); |
| |
| - if (ser->irq != s->cfg->irqs[SCIx_TXI_IRQ] || ser->irq > nr_irqs) |
| + if (ser->irq != s->cfg->irqs[SCIx_TXI_IRQ]) |
| return -EINVAL; |
| if (ser->baud_base < 2400) |
| /* No paper tape reader for Mitch.. */ |
| -- |
| 1.8.5.rc3 |
| |
