diff options
author | 2017-06-13 11:37:18 -0500 | |
---|---|---|
committer | 2017-06-23 00:34:18 +0200 | |
commit | 03036184e9d4a5b2b42a70b66db9455808dd5da9 (patch) | |
tree | 7cae87bbf374c9102acb636c0cdc97a25e40e9ff /net/nfc/nci | |
parent | nfc: Ensure presence of required attributes in the activate_target handler (diff) | |
download | linux-03036184e9d4a5b2b42a70b66db9455808dd5da9.tar.gz linux-03036184e9d4a5b2b42a70b66db9455808dd5da9.tar.bz2 linux-03036184e9d4a5b2b42a70b66db9455808dd5da9.zip |
nfc: nci: remove unnecessary null check
Remove unnecessary NULL check for pointer conn_info.
conn_info is set in list_for_each_entry() using container_of(),
which is never NULL.
Addresses-Coverity-ID: 1362349
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/nci')
-rw-r--r-- | net/nfc/nci/core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 9ec8d8736378..c25e9b4179c3 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -73,11 +73,10 @@ int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type, if (conn_info->dest_type == dest_type) { if (!params) return conn_info->conn_id; - if (conn_info) { - if (params->id == conn_info->dest_params->id && - params->protocol == conn_info->dest_params->protocol) - return conn_info->conn_id; - } + + if (params->id == conn_info->dest_params->id && + params->protocol == conn_info->dest_params->protocol) + return conn_info->conn_id; } } |