|
@@ -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)
|
|
static int pl011_remove(struct amba_device *dev)
|
|
{
|
|
{
|
|
struct uart_amba_port *uap = amba_get_drvdata(dev);
|
|
struct uart_amba_port *uap = amba_get_drvdata(dev);
|
|
|
|
+ bool busy = false;
|
|
int i;
|
|
int i;
|
|
|
|
|
|
uart_remove_one_port(&amba_reg, &uap->port);
|
|
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++)
|
|
for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
|
|
if (amba_ports[i] == uap)
|
|
if (amba_ports[i] == uap)
|
|
amba_ports[i] = NULL;
|
|
amba_ports[i] = NULL;
|
|
|
|
+ else if (amba_ports[i])
|
|
|
|
+ busy = true;
|
|
|
|
|
|
pl011_dma_remove(uap);
|
|
pl011_dma_remove(uap);
|
|
- uart_unregister_driver(&amba_reg);
|
|
|
|
|
|
+ if (!busy)
|
|
|
|
+ uart_unregister_driver(&amba_reg);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|