Commit 9b7c59b1 authored by David S. Miller's avatar David S. Miller

Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
parents 5882eeaf 4197b22d
...@@ -696,7 +696,7 @@ static int sunsu_startup(struct uart_port *port) ...@@ -696,7 +696,7 @@ static int sunsu_startup(struct uart_port *port)
SA_SHIRQ, su_typev[up->su_type], up); SA_SHIRQ, su_typev[up->su_type], up);
} }
if (retval) { if (retval) {
printk("su: Cannot register IRQ\n"); printk("su: Cannot register IRQ %d\n", up->irq);
return retval; return retval;
} }
...@@ -783,6 +783,8 @@ static void sunsu_shutdown(struct uart_port *port) ...@@ -783,6 +783,8 @@ static void sunsu_shutdown(struct uart_port *port)
* Read data port to reset things. * Read data port to reset things.
*/ */
(void) serial_in(up, UART_RX); (void) serial_in(up, UART_RX);
free_irq(up->irq, up);
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment