projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
omap
/
lcd_mipid.c
diff --git
a/drivers/video/omap/lcd_mipid.c
b/drivers/video/omap/lcd_mipid.c
index 64dcc7439c991f704d7920897a715941bfba4c7e..90e3bdd1b7ab933de67123ec0deca8650bd9f114 100644
(file)
--- a/
drivers/video/omap/lcd_mipid.c
+++ b/
drivers/video/omap/lcd_mipid.c
@@
-396,7
+396,7
@@
static void mipid_esd_start_check(struct mipid_device *md)
static void mipid_esd_stop_check(struct mipid_device *md)
{
if (md->esd_check != NULL)
- cancel_
rearming_delayed_workqueue(md->esd_wq,
&md->esd_work);
+ cancel_
delayed_work_sync(
&md->esd_work);
}
static void mipid_esd_work(struct work_struct *work)