tty: amba-pl011: don't dereference NULL platform data

When only a TX DMA channel is specified in DT, pl011_dma_probe() falls
back to looking for the optional RX channel in platform data. What it
doesn't do is check whether that platform data actually exists...

Add the missing check to avoid crashing the kernel.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Robin Murphy 2016-03-03 16:35:35 +00:00 committed by Greg Kroah-Hartman
parent b18a183eaa
commit d9e105ca60

View File

@ -420,7 +420,7 @@ static void pl011_dma_probe(struct uart_amba_port *uap)
/* Optionally make use of an RX channel as well */ /* Optionally make use of an RX channel as well */
chan = dma_request_slave_channel(dev, "rx"); chan = dma_request_slave_channel(dev, "rx");
if (!chan && plat->dma_rx_param) { if (!chan && plat && plat->dma_rx_param) {
chan = dma_request_channel(mask, plat->dma_filter, plat->dma_rx_param); chan = dma_request_channel(mask, plat->dma_filter, plat->dma_rx_param);
if (!chan) { if (!chan) {