serial: mpc52xx_uart: fix null pointer dereference
authorAnatolij Gustschin <agust@denx.de>
Tue, 4 May 2010 22:18:59 +0000 (00:18 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 13 May 2010 19:10:55 +0000 (12:10 -0700)
Commit 6acc6833510db8f72b5ef343296d97480555fda9
introduced NULL pointer dereference and kernel crash
on ppc32 machines while booting. Fix this bug now.

Reported-by: Leonardo Chiquitto <leonardo.lists@gmail.com>
Tested-by: Leonardo Chiquitto <leonardo.lists@gmail.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/serial/mpc52xx_uart.c

index a176ab4..02469c3 100644 (file)
@@ -1467,7 +1467,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;