Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / panel / panel-novatek-nt36523.c

diff --git a/drivers/gpu/drm/panel/panel-novatek-nt36523.c b/drivers/gpu/drm/panel/panel-novatek-nt36523.c
index 63242c45cd7e319b23d118763ed1b9b7480407e8..d6fa76dbf94817100668931ffa55ccece456b9be 100644 (file)
--- a/drivers/gpu/drm/panel/panel-novatek-nt36523.c
+++ b/drivers/gpu/drm/panel/panel-novatek-nt36523.c
@@ -1252,9 +1252,9 @@ static int nt36523_probe(struct mipi_dsi_device *dsi)
                        return dev_err_probe(dev, -EPROBE_DEFER, "cannot get secondary DSI host\n");
 
                pinfo->dsi[1] = mipi_dsi_device_register_full(dsi1_host, info);
-               if (!pinfo->dsi[1]) {
+               if (IS_ERR(pinfo->dsi[1])) {
                        dev_err(dev, "cannot get secondary DSI device\n");
-                       return -ENODEV;
+                       return PTR_ERR(pinfo->dsi[1]);
                }
        }