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

Commit a9bf7d60 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents d3922b69 2ea9f317

drivers/gpu/drm/mediatek/mtk_dpi.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/mediatek/mtk_dsi.c

+1 −3
Original line number Diff line number Diff line
@@ -695,11 +695,9 @@ 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)

{