diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-21 13:03:00 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-21 13:03:00 -0500 |
| commit | d2ff5ee919f0b1377595df80ba49c9921ce4ee62 (patch) | |
| tree | e3e92aff76d158ee8f956a113b7f10b4ea145f87 /net/bluetooth/mgmt.c | |
| parent | b3117494772d8f906625905c6e203af745ee3530 (diff) | |
| parent | 2b2fec4d08a0aabe20d2e749cb7978f04217af65 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index a97948b96b49..142764aec2af 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -485,7 +485,7 @@ static void create_eir(struct hci_dev *hdev, u8 *data) ptr += (name_len + 2); } - if (hdev->inq_tx_power) { + if (hdev->inq_tx_power != HCI_TX_POWER_INVALID) { ptr[0] = 2; ptr[1] = EIR_TX_POWER; ptr[2] = (u8) hdev->inq_tx_power; |