diff --git a/[refs] b/[refs] index 44ad4e8eebf6..8c42d80bcb85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c0b254b7efaa7941b3acfe790dd16597b0964b3 +refs/heads/master: d7ea10d9cbddd49bab282adef805203a36e43101 diff --git a/trunk/drivers/serial/imx.c b/trunk/drivers/serial/imx.c index 03b495c2de14..04cc88cc528c 100644 --- a/trunk/drivers/serial/imx.c +++ b/trunk/drivers/serial/imx.c @@ -403,7 +403,8 @@ static int imx_startup(struct uart_port *port) if (retval) goto error_out2; retval = request_irq(sport->rtsirq, imx_rtsint, - IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, + (sport->rtsirq < IMX_IRQS) ? 0 : + IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, DRIVER_NAME, sport); if (retval) goto error_out3;