diff options
| author | Johan Hedberg | 2014-03-25 11:06:18 +0100 |
|---|---|---|
| committer | Marcel Holtmann | 2014-03-26 17:31:39 +0100 |
| commit | 01735bbd584593b874c2c9d85a5c0e2882a2dc06 (patch) | |
| tree | 452ba0518774d03be1e0d3636ca8d0f4a85b29a2 /net/bluetooth/hci_core.c | |
| parent | Bluetooth: Merge ADV_IND/ADV_SCAN_IND and SCAN_RSP together (diff) | |
| download | kernel-qcow2-linux-01735bbd584593b874c2c9d85a5c0e2882a2dc06.tar.gz kernel-qcow2-linux-01735bbd584593b874c2c9d85a5c0e2882a2dc06.tar.xz kernel-qcow2-linux-01735bbd584593b874c2c9d85a5c0e2882a2dc06.zip | |
Bluetooth: Remove redundant NULL check
All callers of hci_inquiry_cache_update() pass a non-NULL ssp pointer to
it and even the function itself assumes in another place that the
pointer is non-NULL. Therefore, remove the redundant check.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index bfc6f810554e..c6189d9b6c09 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2028,8 +2028,7 @@ bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data, hci_remove_remote_oob_data(hdev, &data->bdaddr); - if (ssp) - *ssp = data->ssp_mode; + *ssp = data->ssp_mode; ie = hci_inquiry_cache_lookup(hdev, &data->bdaddr); if (ie) { |