Merge tag 'imx-drm-fixes-2018-08-03' of git://git.pengutronix.de/git/pza/linux into...

[platform/kernel/linux-starfive.git] / drivers / gpu / ipu-v3 / ipu-common.c

diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
index 66e9405..474b00e 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-common.c
+++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -1405,6 +1405,8 @@ static int ipu_probe(struct platform_device *pdev)
                return -ENODEV;
 
        ipu->id = of_alias_get_id(np, "ipu");
+       if (ipu->id < 0)
+               ipu->id = 0;
 
        if (of_device_is_compatible(np, "fsl,imx6qp-ipu") &&
            IS_ENABLED(CONFIG_DRM)) {