bluetooth: gatt: Fix value returned by db_hash_commit

Change fixes value returned by db_hash_commit. Returning positive value leads to settings load failure. Signed-off-by: Marek Pieta <[email protected]>
jmyllyla · Aug 11, 2022 · 3a1d973 · 3a1d973
1 parent 5563459
commit 3a1d973
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
@@ -5826,16 +5826,28 @@ static int db_hash_set(const char *name, size_t len_rd,
 
 static int db_hash_commit(void)
 {
+	int err;
+
 	atomic_set_bit(gatt_sc.flags, DB_HASH_LOAD);
 	/* Reschedule work to calculate and compare against the Hash value
 	 * loaded from flash.
 	 */
 	if (IS_ENABLED(CONFIG_BT_LONG_WQ)) {
-		return bt_long_wq_reschedule(&db_hash.work, K_NO_WAIT);
+		err = bt_long_wq_reschedule(&db_hash.work, K_NO_WAIT);
 	} else {
-		return k_work_reschedule(&db_hash.work, K_NO_WAIT);
+		err = k_work_reschedule(&db_hash.work, K_NO_WAIT);
+	}
+
+	/* Settings commit uses non-zero value to indicate failure. */
+	if (err > 0) {
+		err = 0;
 	}
 
+	if (err) {
+		BT_ERR("Unable to reschedule database hash process (err %d)", err);
+	}
+
+	return err;
 }
 
 SETTINGS_STATIC_HANDLER_DEFINE(bt_hash, "bt/hash", NULL, db_hash_set,