From da0c4bb9b0ac70dc44ad4ff328c6e88670be2e2e Mon Sep 17 00:00:00 2001 From: Zheng Yang Date: Tue, 14 Apr 2015 21:16:19 +0800 Subject: [PATCH] display-sysfs: Do not disable HDMI in function rk_display_device_enable. Signed-off-by: Zheng Yang --- drivers/video/rockchip/display-sys.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/rockchip/display-sys.c b/drivers/video/rockchip/display-sys.c index b85d5db7e680..5a8f04af17ec 100755 --- a/drivers/video/rockchip/display-sys.c +++ b/drivers/video/rockchip/display-sys.c @@ -466,7 +466,8 @@ void rk_display_device_enable(struct rk_display_device *ddev) if (dev_enable != ddev) ddev->ops->setenable(ddev, 0); } else { - if (dev_enabled) + if (dev_enabled && + dev_enabled->priority != DISPLAY_PRIORITY_HDMI) dev_enabled->ops->setenable(dev_enabled, 0); dev_enable->ops->setenable(dev_enable, 1); } -- 2.34.1