bluetooth: host: fix wrong bt/cf settings loading

François Delawarde · jhedberg · commit 137ebbc43fc6 · 2020-05-27T12:37:37.000+03:00
This commits fixes the loading of bt/cf settings into memory. Only data
was loaded and not the address.

Signed-off-by: François Delawarde &lt;fnde@demant.com&gt;
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
@@ -4303,8 +4303,11 @@ static int cf_set(const char *name, size_t len_rd, settings_read_cb read_cb,
 		cfg = find_cf_cfg(NULL);
 		if (!cfg) {
 			BT_ERR("Unable to restore CF: no cfg left");
-			return 0;
+			return -ENOMEM;
 		}
+
+		cfg->id = id;
+		bt_addr_le_copy(&cfg->peer, &addr);
 	}
 
 	if (len_rd) {

Original file line number	Diff line number	Diff line change
`@@ -4303,8 +4303,11 @@ static int cf_set(const char *name, size_t len_rd, settings_read_cb read_cb,`
`4303`	`4303`	`cfg = find_cf_cfg(NULL);`
`4304`	`4304`	`if (!cfg) {`
`4305`	`4305`	`BT_ERR("Unable to restore CF: no cfg left");`
`4306`		`- return 0;`
	`4306`	`+ return -ENOMEM;`
`4307`	`4307`	`}`
	`4308`	`+`
	`4309`	`+ cfg->id = id;`
	`4310`	`+ bt_addr_le_copy(&cfg->peer, &addr);`
`4308`	`4311`	`}`
`4309`	`4312`
`4310`	`4313`	`if (len_rd) {`