summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/amp.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2017-10-30 05:42:59 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2017-10-30 06:25:45 -0400
commit2064ee332e4c1b7495cf68b84355c213d8fe71fd (patch)
tree9bb470d9296dbf14c02a67612fe83c32fec3ba6d /net/bluetooth/amp.c
parenta9ee77af751f435675054f5a7e2d2e69cbfe9e33 (diff)
Bluetooth: Use bt_dev_err and bt_dev_info when possible
In case of using BT_ERR and BT_INFO, convert to bt_dev_err and bt_dev_info when possible. This allows for controller specific reporting. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/amp.c')
-rw-r--r--net/bluetooth/amp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c
index ebcab5bbadd7..78bec8df8525 100644
--- a/net/bluetooth/amp.c
+++ b/net/bluetooth/amp.c
@@ -187,7 +187,7 @@ int phylink_gen_key(struct hci_conn *conn, u8 *data, u8 *len, u8 *type)
187 187
188 /* Legacy key */ 188 /* Legacy key */
189 if (conn->key_type < 3) { 189 if (conn->key_type < 3) {
190 BT_ERR("Legacy key type %d", conn->key_type); 190 bt_dev_err(hdev, "legacy key type %d", conn->key_type);
191 return -EACCES; 191 return -EACCES;
192 } 192 }
193 193
@@ -207,7 +207,7 @@ int phylink_gen_key(struct hci_conn *conn, u8 *data, u8 *len, u8 *type)
207 /* Derive Generic AMP Link Key (gamp) */ 207 /* Derive Generic AMP Link Key (gamp) */
208 err = hmac_sha256(keybuf, HCI_AMP_LINK_KEY_SIZE, "gamp", 4, gamp_key); 208 err = hmac_sha256(keybuf, HCI_AMP_LINK_KEY_SIZE, "gamp", 4, gamp_key);
209 if (err) { 209 if (err) {
210 BT_ERR("Could not derive Generic AMP Key: err %d", err); 210 bt_dev_err(hdev, "could not derive Generic AMP Key: err %d", err);
211 return err; 211 return err;
212 } 212 }
213 213