The patch titled serial: mpc52xx_uart: fix null pointer dereference has been added to the -mm tree. Its filename is serial-mpc52xx_uart-fix-null-pointer-dereference.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: serial: mpc52xx_uart: fix null pointer dereference From: Anatolij Gustschin <agust@xxxxxxx> Commit 6acc6833510db8f72b5ef343296d97480555fda9 ("serial: mpc52xx_uart: re-enable mpc5121 PSC UART support") introduced a NULL pointer dereference and kernel crash on ppc32 machines while booting. Fix this bug now. Signed-off-by: Anatolij Gustschin <agust@xxxxxxx> Reported-by: Leonardo Chiquitto <leonardo.lists@xxxxxxxxx> Cc: John Rigby <jcrigby@xxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx> Cc: Grant Likely <grant.likely@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/mpc52xx_uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/serial/mpc52xx_uart.c~serial-mpc52xx_uart-fix-null-pointer-dereference drivers/serial/mpc52xx_uart.c --- a/drivers/serial/mpc52xx_uart.c~serial-mpc52xx_uart-fix-null-pointer-dereference +++ a/drivers/serial/mpc52xx_uart.c @@ -1554,7 +1554,7 @@ mpc52xx_uart_init(void) /* * Map the PSC FIFO Controller and init if on MPC512x. */ - if (psc_ops->fifoc_init) { + if (psc_ops && psc_ops->fifoc_init) { ret = psc_ops->fifoc_init(); if (ret) return ret; _ Patches currently in -mm which might be from agust@xxxxxxx are linux-next.patch serial-mpc52xx_uart-fix-null-pointer-dereference.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html