]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
nfc: nci: remove unnecessary null check
authorGustavo A. R. Silva <garsilva@embeddedor.com>
Tue, 13 Jun 2017 16:37:18 +0000 (11:37 -0500)
committerSamuel Ortiz <sameo@linux.intel.com>
Thu, 22 Jun 2017 22:34:18 +0000 (00:34 +0200)
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>
net/nfc/nci/core.c

index 9ec8d87363784c2e8b08e4ea7220f0d14b50f1f3..c25e9b4179c34b571c6adbb65f3cff9f60dad06d 100644 (file)
@@ -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;
                }
        }