Skip to content

Commit a25e29b

Browse files
committed
Merge branch 'omap-for-v5.6/sdma' into omap-for-v5.6/ti-sysc-drop-pdata
2 parents 9fc85a7 + 9947726 commit a25e29b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/dma/ti/omap-dma.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,8 +1658,10 @@ static int omap_dma_probe(struct platform_device *pdev)
16581658
if (conf) {
16591659
od->cfg = conf;
16601660
od->plat = dev_get_platdata(&pdev->dev);
1661-
if (!od->plat)
1662-
dev_warn(&pdev->dev, "no sdma auxdata needed?\n");
1661+
if (!od->plat) {
1662+
dev_err(&pdev->dev, "omap_system_dma_plat_info is missing");
1663+
return -ENODEV;
1664+
}
16631665
} else {
16641666
od->cfg = &default_cfg;
16651667

0 commit comments

Comments
 (0)