Merge branch 'omap-for-v5.6/sdma' into omap-for-v5.6/ti-sysc-drop-pdata

a25e29bd · Tony Lindgren · 9fc85a71 · 99477263 · a25e29bd
Commit a25e29bd authored Jan 13, 2020 by Tony Lindgren
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

drivers/dma/ti/omap-dma.c drivers/dma/ti/omap-dma.c +4 -2

No files found.
--- 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)
+		if (!od->plat) {
-			dev_warn(&pdev->dev, "no sdma auxdata needed?\n");
+			dev_err(&pdev->dev, "omap_system_dma_plat_info is missing");
+			return -ENODEV;
+		}
 	} else {
 		od->cfg = &default_cfg;