Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[mce] Parse static config before probing for fb device. Fixes JB#42607
MCE aborts during startup if frame buffer device node does not exist.
This happens because the fallback is to use frame buffer power control
from android hal via mce-plugin-libhybris, and the plugin directory
is defined in static configuration - which is not yet initialized.

Parse static configuration before probing frame buffer power controls.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Aug 15, 2018
1 parent 4dec850 commit 06b77cb
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions mce.c
Expand Up @@ -1033,20 +1033,20 @@ int main(int argc, char **argv)

/* Initialise subsystems */

/* Open fbdev as early as possible */
mce_fbdev_init();

/* Start worker thread */
if( !mce_worker_init() )
goto EXIT;

/* Get configuration options */
if( !mce_conf_init() ) {
mce_log(LL_CRIT,
"Failed to initialise configuration options");
exit(EXIT_FAILURE);
}

/* Open fbdev as early as possible */
mce_fbdev_init();

/* Start worker thread */
if( !mce_worker_init() )
goto EXIT;

/* Initialise D-Bus */
if( !mce_dbus_init(mce_args.systembus) ) {
mce_log(LL_CRIT,
Expand Down

0 comments on commit 06b77cb

Please sign in to comment.