diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-06-01 22:57:20 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-06-01 22:57:20 +0200 |
| commit | a9bf7d60c273763d3f0f4f991bd96fbc411bfd73 (patch) | |
| tree | 1ac81a645518f614ac6d0097f1f8d46a5045085e /drivers/gpu/drm | |
| parent | drm/mgag200: Black screen fix for G200e rev 4 (diff) | |
| parent | drm/mediatek: mtk_dsi: Remove spurious drm_connector_unregister (diff) | |
| download | linux-a9bf7d60c273763d3f0f4f991bd96fbc411bfd73.tar.xz linux-a9bf7d60c273763d3f0f4f991bd96fbc411bfd73.zip | |
Merge tag 'mediatek-drm-fixes-2016-06-01' of git://git.pengutronix.de/git/pza/linux into drm-fixes
mediatek-drm fixes
- remove an invalid, unreachable error message and NULL pointer dereference
- remove a spurious drm_connector_unregister call from the DSI driver
* tag 'mediatek-drm-fixes-2016-06-01' of git://git.pengutronix.de/git/pza/linux:
drm/mediatek: mtk_dsi: Remove spurious drm_connector_unregister
drm/mediatek: mtk_dpi: remove invalid error message
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_dpi.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_dsi.c | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index d05ca7901315..0186e500d2a5 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -432,11 +432,6 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, unsigned long pll_rate; unsigned int factor; - if (!dpi) { - dev_err(dpi->dev, "invalid argument\n"); - return -EINVAL; - } - pix_rate = 1000UL * mode->clock; if (mode->clock <= 74000) factor = 8 * 3; diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 2d808e59fefd..769559124562 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -695,10 +695,8 @@ static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi) { drm_encoder_cleanup(&dsi->encoder); /* Skip connector cleanup if creation was delegated to the bridge */ - if (dsi->conn.dev) { - drm_connector_unregister(&dsi->conn); + if (dsi->conn.dev) drm_connector_cleanup(&dsi->conn); - } } static void mtk_dsi_ddp_start(struct mtk_ddp_comp *comp) |