1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index d4eda24aa68b..dacf0a09ab24 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -318,7 +318,7 @@ static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port *
                         .src_addr = uap->port.mapbase + UART01x_DR,
                         .src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
                         .direction = DMA_DEV_TO_MEM,
-                        .src_maxburst = uap->fifosize >> 1,
+                        .src_maxburst = uap->fifosize >> 2,
                         .device_fc = false,
                 };
 
@@ -2176,6 +2176,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
 static int pl011_remove(struct amba_device *dev)
 {
         struct uart_amba_port *uap = amba_get_drvdata(dev);
+        bool busy = false;
         int i;
 
         uart_remove_one_port(&amba_reg, &uap->port);
@@ -2183,9 +2184,12 @@ static int pl011_remove(struct amba_device *dev)
         for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
                 if (amba_ports[i] == uap)
                         amba_ports[i] = NULL;
+                else if (amba_ports[i])
+                        busy = true;
 
         pl011_dma_remove(uap);
-        uart_unregister_driver(&amba_reg);
+        if (!busy)
+                uart_unregister_driver(&amba_reg);
         return 0;
 }