summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoungjae Cho <y0.cho@samsung.com>2020-03-30 18:18:03 +0900
committerHyotaek Shim <hyotaek.shim@samsung.com>2020-03-31 03:26:51 +0000
commit38f348f94ebc59c1660635840952a11c427d7118 (patch)
tree2d135689b04655ade206da7f4d20c337ebbf50e2
parent6deec1de1af5c58ee2072a78db314bfde4b2f82b (diff)
downloaddeviced-38f348f94ebc59c1660635840952a11c427d7118.tar.gz
deviced-38f348f94ebc59c1660635840952a11c427d7118.tar.bz2
deviced-38f348f94ebc59c1660635840952a11c427d7118.zip
Fix PMQOS dbus initialization error
Move dbus_handle_add_dbus_object() from booting_done() to pmqos_init(). As booting_done is called twice, dbus_handle_add_dbus_object() is called twice too, and it causes error. E/DEVICED ( 336): pmqos.c: booting_done(471) > Failed to init dbus method: -1 Change-Id: I5c91a5b1e8725d79f7bcec6d23b23013f8184687 Signed-off-by: Youngjae Cho <y0.cho@samsung.com>
-rw-r--r--src/cpu/pmqos.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/cpu/pmqos.c b/src/cpu/pmqos.c
index 2eb40744..21dc9f18 100644
--- a/src/cpu/pmqos.c
+++ b/src/cpu/pmqos.c
@@ -460,15 +460,12 @@ static int booting_done(void *data)
if (data == NULL)
goto out;
+
done = *(int *)data;
if (!done)
goto out;
_I("Booting done.");
- /* register dbus methods */
- ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_PMQOS, &dbus_interface);
- if (ret < 0)
- _E("Failed to init dbus method: %d", ret);
/* get methods from config file */
size = get_methods_from_conf(PMQOS_CONF_PATH, &methods);
@@ -528,6 +525,13 @@ static int pmqos_probe(void *data)
static void pmqos_init(void *data)
{
+ int ret;
+
+ /* register dbus methods */
+ ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_PMQOS, &dbus_interface);
+ if (ret < 0)
+ _E("Failed to init dbus method: %d", ret);
+
register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done);
}