aboutsummaryrefslogtreecommitdiff
path: root/drivers/video/auo_k1900fb.c
diff options
context:
space:
mode:
authorHeiko Stübner <heiko@sntech.de>2013-03-22 15:13:37 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-04 13:08:06 +0300
commit70f1e28e65dec704cd49bf7e21c2c372096cf5b3 (patch)
tree1fefaac9ed8d2e8fe0ccd91b727c237017dd240d /drivers/video/auo_k1900fb.c
parenta1655100ddfa10829b7d3b055611f268a82e335a (diff)
downloadlinux-70f1e28e65dec704cd49bf7e21c2c372096cf5b3.tar.gz
AUO-K190x: add runtime-pm calls to controller init functions
The controller init may be called from a context where the device is runtime suspended, leading to a deadlock, as the controllers only accepts the wakeup command when suspended. Signed-off-by: Heiko Stübner <heiko@sntech.de> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/auo_k1900fb.c')
-rw-r--r--drivers/video/auo_k1900fb.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/auo_k1900fb.c b/drivers/video/auo_k1900fb.c
index d572d3e9c50..f5b668e77af 100644
--- a/drivers/video/auo_k1900fb.c
+++ b/drivers/video/auo_k1900fb.c
@@ -60,9 +60,12 @@
static void auok1900_init(struct auok190xfb_par *par)
{
+ struct device *dev = par->info->device;
struct auok190x_board *board = par->board;
u16 init_param = 0;
+ pm_runtime_get_sync(dev);
+
init_param |= AUOK1900_INIT_TEMP_AVERAGE;
init_param |= AUOK1900_INIT_ROTATE(par->rotation);
init_param |= AUOK190X_INIT_INVERSE_WHITE;
@@ -74,6 +77,9 @@ static void auok1900_init(struct auok190xfb_par *par)
/* let the controller finish */
board->wait_for_rdy(par);
+
+ pm_runtime_mark_last_busy(dev);
+ pm_runtime_put_autosuspend(dev);
}
static void auok1900_update_region(struct auok190xfb_par *par, int mode,