* [PATCH] tty: amba-pl011: don't dereference NULL platform data
@ 2016-03-03 16:35 Robin Murphy
0 siblings, 0 replies; only message in thread
From: Robin Murphy @ 2016-03-03 16:35 UTC (permalink / raw)
To: linux, gregkh; +Cc: linux-arm-kernel, linux-serial, jslaby
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>
---
drivers/tty/serial/amba-pl011.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index c0da0cc..a4dd91a 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -420,7 +420,7 @@ static void pl011_dma_probe(struct uart_amba_port *uap)
/* Optionally make use of an RX channel as well */
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);
if (!chan) {
--
2.7.2.333.g70bd996.dirty
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-03-03 16:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-03 16:35 [PATCH] tty: amba-pl011: don't dereference NULL platform data Robin Murphy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).