Commit 25e3e811 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'omap-for-v5.6/sdma-fix-signed' of...

Merge tag 'omap-for-v5.6/sdma-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Fix omap sdma handling for missing auxdata for v5.6 merge window

Turns out I was overly optimistic about making platform data optional, and
we still need it to pass various quirk flags. If the platform data is missing
for whatever reason, we will currently try to access non-existing data later
on.

* tag 'omap-for-v5.6/sdma-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  dmaengine: ti: omap-dma: don't allow a null od->plat pointer to be dereferenced

Link: https://lore.kernel.org/r/pull-1579200367-372444@atomide.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents dee0be5c a25e29bd
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment