Commit d2cfe962 authored by Peter Korsgaard's avatar Peter Korsgaard Committed by Live-CD User
Browse files

uartlite: support shared interrupt lines 



Adapt isr to work with shared interrupt lines.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 054f2346

drivers/serial/uartlite.c

+10 −5
Original line number Diff line number Diff line
@@ -154,17 +154,22 @@ static int ulite_transmit(struct uart_port *port, int stat) 
static irqreturn_t ulite_isr(int irq, void *dev_id)

{

	struct uart_port *port = dev_id;

	int busy;

	int busy, n = 0;



	do {

		int stat = readb(port->membase + ULITE_STATUS);

		busy  = ulite_receive(port, stat);

		busy |= ulite_transmit(port, stat);

		n++;

	} while (busy);



	/* work done? */

	if (n > 1) {

		tty_flip_buffer_push(port->state->port.tty);



		return IRQ_HANDLED;

	} else {

		return IRQ_NONE;

	}

}



static unsigned int ulite_tx_empty(struct uart_port *port)
@@ -221,7 +226,7 @@ static int ulite_startup(struct uart_port *port) 
	int ret;



	ret = request_irq(port->irq, ulite_isr,

			  IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "uartlite", port);

			  IRQF_SHARED | IRQF_SAMPLE_RANDOM, "uartlite", port);

	if (ret)

		return ret;