fixup! serial: 8250: Add NOMSI bug for bcm2835aux

Author: pelwell

drivers/tty/serial/8250/8250_port.c

@@ -1399,7 +1399,7 @@ static void serial8250_stop_tx(struct uart_port *port)
 {
 	struct uart_8250_port *up = up_to_u8250p(port);
 
-	guard(serial8250_rpm)(up);
+	serial8250_rpm_get(up);
 	__stop_tx(up);
 
 	/*
@@ -1409,6 +1409,10 @@ static void serial8250_stop_tx(struct uart_port *port)
 		up->acr |= UART_ACR_TXDIS;
 		serial_icr_write(up, UART_ACR, up->acr);
 	}
+	serial8250_rpm_put(up);
+
+	if (port->hw_stopped && (up->bugs & UART_BUG_NOMSI))
+		mod_timer(&up->timer, jiffies + 1);
 }
 
 static inline void __start_tx(struct uart_port *port)
@@ -2400,9 +2404,6 @@ void serial8250_do_shutdown(struct uart_port *port)
 	serial_port_in(port, UART_RX);
 	serial8250_rpm_put(up);
 
-	if (port->hw_stopped && (up->bugs & UART_BUG_NOMSI))
-		mod_timer(&up->timer, jiffies + 1);
-
 	up->ops->release_irq(up);
 }
 EXPORT_SYMBOL_GPL(serial8250_do_shutdown);