Skip to content

Bluetooth: audio: Fix error message in PACS #49414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2022
Merged

Bluetooth: audio: Fix error message in PACS #49414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions subsys/bluetooth/audio/pacs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,25 +307,25 @@ static ssize_t snk_loc_write(struct bt_conn *conn,
}

if (len != sizeof(location)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
}

if (pacs_cb == NULL ||
pacs_cb->write_location == NULL) {
BT_WARN("No callback for write_location");
return BT_GATT_ERR(BT_ATT_ERR_UNLIKELY);
return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
}

location = (enum bt_audio_location)sys_get_le32(data);
if (location > BT_AUDIO_LOCATION_MASK || location == 0) {
BT_DBG("Invalid location value: 0x%08X", location);
return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
}

err = pacs_cb->write_location(conn, BT_AUDIO_DIR_SINK, location);
if (err != 0) {
BT_DBG("write_location returned %d", err);
return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
}

return len;
Expand Down Expand Up @@ -403,25 +403,25 @@ static ssize_t src_loc_write(struct bt_conn *conn,
}

if (len != sizeof(location)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
}

if (pacs_cb == NULL ||
pacs_cb->write_location == NULL) {
BT_WARN("No callback for write_location");
return BT_GATT_ERR(BT_ATT_ERR_UNLIKELY);
return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
}

location = (enum bt_audio_location)sys_get_le32(data);
if (location > BT_AUDIO_LOCATION_MASK || location == 0) {
BT_DBG("Invalid location value: 0x%08X", location);
return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
}

err = pacs_cb->write_location(conn, BT_AUDIO_DIR_SOURCE, location);
if (err != 0) {
BT_DBG("write_location returned %d", err);
return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
}

return len;
Expand Down