mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
fbdev: sh_mobile_lcdcfb: fix module lock acquisition
Whenever the LCDC is to be started or stopped, a board callback is checked for existence and invoked. Prior to the invokation, the callback's module lock is also acquired, to be released once the callback returns. However, the order of testing makes it possible for the lock to be acquired and not released in case the callback does not exist. This patch reorders the tests to prevent this particular case. Signed-off-by: Alexandre Courbot <gnurou@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
8857b9aa7e
commit
247f993861
1 changed files with 4 additions and 4 deletions
|
@ -616,7 +616,7 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
|
|||
continue;
|
||||
|
||||
board_cfg = &ch->cfg.board_cfg;
|
||||
if (try_module_get(board_cfg->owner) && board_cfg->display_on) {
|
||||
if (board_cfg->display_on && try_module_get(board_cfg->owner)) {
|
||||
board_cfg->display_on(board_cfg->board_data, ch->info);
|
||||
module_put(board_cfg->owner);
|
||||
}
|
||||
|
@ -661,7 +661,7 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv)
|
|||
}
|
||||
|
||||
board_cfg = &ch->cfg.board_cfg;
|
||||
if (try_module_get(board_cfg->owner) && board_cfg->display_off) {
|
||||
if (board_cfg->display_off && try_module_get(board_cfg->owner)) {
|
||||
board_cfg->display_off(board_cfg->board_data);
|
||||
module_put(board_cfg->owner);
|
||||
}
|
||||
|
@ -1228,7 +1228,7 @@ static int sh_mobile_lcdc_notify(struct notifier_block *nb,
|
|||
|
||||
switch(action) {
|
||||
case FB_EVENT_SUSPEND:
|
||||
if (try_module_get(board_cfg->owner) && board_cfg->display_off) {
|
||||
if (board_cfg->display_off && try_module_get(board_cfg->owner)) {
|
||||
board_cfg->display_off(board_cfg->board_data);
|
||||
module_put(board_cfg->owner);
|
||||
}
|
||||
|
@ -1241,7 +1241,7 @@ static int sh_mobile_lcdc_notify(struct notifier_block *nb,
|
|||
mutex_unlock(&ch->open_lock);
|
||||
|
||||
/* HDMI must be enabled before LCDC configuration */
|
||||
if (try_module_get(board_cfg->owner) && board_cfg->display_on) {
|
||||
if (board_cfg->display_on && try_module_get(board_cfg->owner)) {
|
||||
board_cfg->display_on(board_cfg->board_data, info);
|
||||
module_put(board_cfg->owner);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue