michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/nble: gatt: Fix loosing errcode and wrong comparision

Browse source 
Fix assigning negative error code to unsigned int and then compare it
against zero.

Change-Id: Idedaf91dda20a38806ee81d5c488ae8b46c8feff
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This commit is contained in:
Andrei Emeltchenko 2016-02-04 12:02:51 +02:00 • committed by Anas Nashif
commit bb34c219ce
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/nble/gatt.c
View file

@ -127,6 +127,7 @@ int bt_gatt_register(struct bt_gatt_attr *attrs, size_t count)
for (i = 0; i < count; i++) {
struct bt_gatt_attr *attr = &attrs[i];
struct ble_gatt_attr *att;
int err;
if (attr_table_size + sizeof(*att) > sizeof(attr_table)) {
return -ENOMEM;
@ -138,14 +139,15 @@ int bt_gatt_register(struct bt_gatt_attr *attrs, size_t count)
attr_table_size += sizeof(*att);
/* Read attribute data */
att->data_size = attr_read(attr, att->data,
sizeof(attr_table) -
attr_table_size);
if (att->data_size < 0) {
BT_ERR("Failed to read attr: %d", att->data_size);
return att->data_size;
err = attr_read(attr, att->data,
sizeof(attr_table) - attr_table_size);
if (err < 0) {
BT_ERR("Failed to read attr: %d", err);
return err;
}
att->data_size = err;
/* Compute the new element size and align it on upper 4 bytes
* boundary.
*/