i.MX8 MM & MN are both ARM64 SoCs with a device compatible
with "fsl,imx28-dma-apbh". Probing the barebox device driver on these
SoCs would invoke undefined behavior however, because of an
errant cast. Fix this.

Signed-off-by: Ahmad Fatoum <[email protected]>
---
 drivers/dma/apbh_dma.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 3bee89f78b85..0e4961f6cbde 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -50,6 +50,7 @@
 static struct mxs_dma_chan mxs_dma_channels[MXS_MAX_DMA_CHANNELS];
 
 enum mxs_dma_id {
+       UNKNOWN_DMA_ID,
        IMX23_DMA,
        IMX28_DMA,
 };
@@ -596,9 +597,9 @@ static int apbh_dma_probe(struct device_d *dev)
        enum mxs_dma_id id;
        int ret, channel;
 
-       ret = dev_get_drvdata(dev, (const void **)&id);
-       if (ret)
-               return ret;
+       id = (enum mxs_dma_id)device_get_match_data(dev);
+       if (id == UNKNOWN_DMA_ID)
+               return -ENODEV;
 
        apbh_dma = apbh = xzalloc(sizeof(*apbh));
        iores = dev_request_mem_resource(dev, 0);
-- 
2.28.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Reply via email to