projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
63e851a
)
rk3368 lcdc: fix deadlock when close lcdc and update reg
author
hjc
<hjc@rock-chips.com>
Fri, 27 Mar 2015 10:57:38 +0000
(18:57 +0800)
committer
hjc
<hjc@rock-chips.com>
Fri, 27 Mar 2015 10:58:21 +0000
(18:58 +0800)
Signed-off-by: hjc <hjc@rock-chips.com>
drivers/video/rockchip/lcdc/rk3368_lcdc.c
patch
|
blob
|
history
diff --git
a/drivers/video/rockchip/lcdc/rk3368_lcdc.c
b/drivers/video/rockchip/lcdc/rk3368_lcdc.c
index 3007d42cc978fa3adb53d78f9b69d4c33c726813..1a524ffd088ffdcb705f00631516906ae5c2a3ad 100755
(executable)
--- a/
drivers/video/rockchip/lcdc/rk3368_lcdc.c
+++ b/
drivers/video/rockchip/lcdc/rk3368_lcdc.c
@@
-1392,7
+1392,6
@@
static int rk3368_lcdc_layer_update_regs(struct lcdc_device *lcdc_dev,
int timeout;
unsigned long flags;
- spin_lock(&lcdc_dev->reg_lock);
if (likely(lcdc_dev->clk_on)) {
lcdc_msk_reg(lcdc_dev, SYS_CTRL, m_STANDBY_EN,
v_STANDBY_EN(lcdc_dev->standby));
@@
-1405,7
+1404,6
@@
static int rk3368_lcdc_layer_update_regs(struct lcdc_device *lcdc_dev,
/*rk3368_lcdc_post_cfg(dev_drv); */
lcdc_cfg_done(lcdc_dev);
}
- spin_unlock(&lcdc_dev->reg_lock);
/*if (dev_drv->wait_fs) { */
if (0) {