commit 9b96fbac introduced use of pointer before it is initialized, resulting in a NULL pointer dereference on boot for the ARM Realview.
uap->port.membase is initialized to base a few lines later, so just use base. Signed-off-by: Frank Rowand <[email protected]> --- drivers/tty/serial/amba-pl011.c | 4 2 + 2 - 0 ! 1 file changed, 2 insertions(+), 2 deletions(-) Index: b/drivers/tty/serial/amba-pl011.c =================================================================== --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1947,8 +1947,8 @@ static int pl011_probe(struct amba_devic } /* Ensure interrupts from this UART are masked and cleared */ - writew(0, uap->port.membase + UART011_IMSC); - writew(0xffff, uap->port.membase + UART011_ICR); + writew(0, base + UART011_IMSC); + writew(0xffff, base + UART011_ICR); uap->vendor = vendor; uap->lcrh_rx = vendor->lcrh_rx; -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
