diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-03-25 06:06:18 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-03-26 12:31:39 -0400 |
commit | 01735bbd584593b874c2c9d85a5c0e2882a2dc06 (patch) | |
tree | 452ba0518774d03be1e0d3636ca8d0f4a85b29a2 /net/bluetooth | |
parent | b9a6328f2a7f15490de7e45eabb025f8b74a81af (diff) |
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')
-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, | |||
2028 | 2028 | ||
2029 | hci_remove_remote_oob_data(hdev, &data->bdaddr); | 2029 | hci_remove_remote_oob_data(hdev, &data->bdaddr); |
2030 | 2030 | ||
2031 | if (ssp) | 2031 | *ssp = data->ssp_mode; |
2032 | *ssp = data->ssp_mode; | ||
2033 | 2032 | ||
2034 | ie = hci_inquiry_cache_lookup(hdev, &data->bdaddr); | 2033 | ie = hci_inquiry_cache_lookup(hdev, &data->bdaddr); |
2035 | if (ie) { | 2034 | if (ie) { |