Single bridge attachment fix.
Unified · Split
| @@ -818,10 +818,13 @@ static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi) · 817 unmodified lines | |||
| 818 | dsi->encoder.possible_crtcs = 1; | 818 | dsi->encoder.possible_crtcs = 1; |
| 819 | 819 | ||
| 820 | /* If there's a bridge, attach to it and let it create the connector */ | 820 | /* If there's a bridge, attach to it and let it create the connector */ |
| 821 | ret = drm_bridge_attach(&dsi->encoder, dsi->bridge, NULL); | 821 | if (dsi->bridge) { |
| 822 | if (ret) { | 822 | ret = drm_bridge_attach(&dsi->encoder, dsi->bridge, NULL); |
| 823 | DRM_ERROR("Failed to attach bridge to drm\n"); | 823 | if (ret) { |
| 824 | 824 | DRM_ERROR("Failed to attach bridge to drm\n"); | |
| 825 | goto err_encoder_cleanup; | ||
| 826 | } | ||
| 827 | } else { | ||
| 825 | /* Otherwise create our own connector and attach to a panel */ | 828 | /* Otherwise create our own connector and attach to a panel */ |
| 826 | ret = mtk_dsi_create_connector(drm, dsi); | 829 | ret = mtk_dsi_create_connector(drm, dsi); |
| 827 | if (ret) | 830 | if (ret) |