Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+1 -8
-5
drivers/gpu/drm/mediatek/mtk_dpi.c
··· 432 432 unsigned long pll_rate; 433 433 unsigned int factor; 434 434 435 - if (!dpi) { 436 - dev_err(dpi->dev, "invalid argument\n"); 437 - return -EINVAL; 438 - } 439 - 440 435 pix_rate = 1000UL * mode->clock; 441 436 if (mode->clock <= 74000) 442 437 factor = 8 * 3;
+1 -3
drivers/gpu/drm/mediatek/mtk_dsi.c
··· 695 695 { 696 696 drm_encoder_cleanup(&dsi->encoder); 697 697 /* Skip connector cleanup if creation was delegated to the bridge */ 698 - if (dsi->conn.dev) { 699 - drm_connector_unregister(&dsi->conn); 698 + if (dsi->conn.dev) 700 699 drm_connector_cleanup(&dsi->conn); 701 - } 702 700 } 703 701 704 702 static void mtk_dsi_ddp_start(struct mtk_ddp_comp *comp)