drm/omap: dss: Handle DPI and SDI port initialization failures (8023651b) · Commits · 戴 / test

The dpi_init_port() and sdi_init_port() functions can return errors but their return value is ignored. This prevents both probe failures and probe deferral from working correctly. Propagate the errors up the call stack. Signed-off-by:

Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by:

Sebastian Reichel <sebastian.reichel@collabora.co.uk> Signed-off-by:

Tomi Valkeinen <tomi.valkeinen@ti.com>

drivers/gpu/drm/omapdrm/dss/dss.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -1183,7 +1183,8 @@ static int dss_init_ports(struct dss_device *dss)
		struct platform_device *pdev = dss->pdev;
		struct device_node *parent = pdev->dev.of_node;
		struct device_node *port;
		int i;
		unsigned int i;
		int r;

		for (i = 0; i < dss->feat->num_ports; i++) {
		port = of_graph_get_port_by_id(parent, i);
		@@ -1192,11 +1193,17 @@ static int dss_init_ports(struct dss_device *dss)

		switch (dss->feat->ports[i]) {
		case OMAP_DISPLAY_TYPE_DPI:
		dpi_init_port(dss, pdev, port, dss->feat->model);
		r = dpi_init_port(dss, pdev, port, dss->feat->model);
		if (r)
		return r;
		break;

		case OMAP_DISPLAY_TYPE_SDI:
		sdi_init_port(dss, pdev, port);
		r = sdi_init_port(dss, pdev, port);
		if (r)
		return r;
		break;

		default:
		break;
		}

Admin message