summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2020-01-13 09:42:55 -0800
committerTony Lindgren <tony@atomide.com>2020-01-13 09:42:55 -0800
commita25e29bd0fe9be33491b3816d2d7b1137d5eeaec (patch)
tree0aedd688a64d645fbeae4dc9ae800df0e0a4b99b
parent9fc85a7124b5ff9ec24ad391f9994f89ae611313 (diff)
parent994772632f006e97addd20277a820058bb0fd481 (diff)
downloadlinux-a25e29bd0fe9be33491b3816d2d7b1137d5eeaec.tar.bz2
Merge branch 'omap-for-v5.6/sdma' into omap-for-v5.6/ti-sysc-drop-pdata
-rw-r--r--drivers/dma/ti/omap-dma.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
index fc8f7b2fc7b3..a014ab96e673 100644
--- a/drivers/dma/ti/omap-dma.c
+++ b/drivers/dma/ti/omap-dma.c
@@ -1658,8 +1658,10 @@ static int omap_dma_probe(struct platform_device *pdev)
if (conf) {
od->cfg = conf;
od->plat = dev_get_platdata(&pdev->dev);
- if (!od->plat)
- dev_warn(&pdev->dev, "no sdma auxdata needed?\n");
+ if (!od->plat) {
+ dev_err(&pdev->dev, "omap_system_dma_plat_info is missing");
+ return -ENODEV;
+ }
} else {
od->cfg = &default_cfg;