Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f07c935 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: update use of drm_bridge_attach in dp and dsi drivers"

parents afbdc42b 7b996496

drivers/gpu/drm/msm/dp/dp_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ int dp_drm_bridge_init(void *data, struct drm_encoder *encoder) 


	priv = dev->dev_private;



	rc = drm_bridge_attach(dev, &bridge->base);

	rc = drm_bridge_attach(encoder, &bridge->base, NULL);

	if (rc) {

		pr_err("failed to attach bridge, rc=%d\n", rc);

		goto error_free_bridge;

drivers/gpu/drm/msm/dsi-staging/dsi_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ struct dsi_bridge *dsi_drm_bridge_init(struct dsi_display *display, 
	bridge->base.funcs = &dsi_bridge_ops;

	bridge->base.encoder = encoder;



	rc = drm_bridge_attach(dev, &bridge->base);

	rc = drm_bridge_attach(encoder, &bridge->base, NULL);

	if (rc) {

		pr_err("failed to attach bridge, rc=%d\n", rc);

		goto error_free_bridge;