The "names" file is shared by both BR/EDR and LE devices, so we must keep backward compatibility with the old storage format. --- src/storage.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/storage.c b/src/storage.c index cb7cde2..97817cc 100644 --- a/src/storage.c +++ b/src/storage.c @@ -400,9 +400,17 @@ int read_device_name(const char *src, const char *dst, uint8_t bdaddr_type, snprintf(key, sizeof(key), "%17s#%hhu", dst, bdaddr_type); str = textfile_get(filename, key); - if (!str) + if (str != NULL) + goto done; + + /* Try old format (address only) */ + key[17] = '\0'; + + str = textfile_get(filename, key); + if (str == NULL) return -ENOENT; +done: len = strlen(str); if (len > HCI_MAX_NAME_LENGTH) str[HCI_MAX_NAME_LENGTH] = '\0'; -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
