Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[firefly-linux-kernel-4.4.55.git] / net / nfc / core.c

diff --git a/net/nfc/core.c b/net/nfc/core.c
index ca1e65f4b1331bfd164245996ed462ab61f46a4e..819b87702b7039ceed68085139d2820a2d5711c0 100644 (file)
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -280,9 +280,6 @@ static struct nfc_target *nfc_find_target(struct nfc_dev *dev, u32 target_idx)
 {
        int i;
 
-       if (dev->n_targets == 0)
-               return NULL;
-
        for (i = 0; i < dev->n_targets; i++) {
                if (dev->targets[i].idx == target_idx)
                        return &dev->targets[i];
@@ -546,9 +543,9 @@ error:
 
 struct nfc_se *nfc_find_se(struct nfc_dev *dev, u32 se_idx)
 {
-       struct nfc_se *se, *n;
+       struct nfc_se *se;
 
-       list_for_each_entry_safe(se, n, &dev->secure_elements, list)
+       list_for_each_entry(se, &dev->secure_elements, list)
                if (se->idx == se_idx)
                        return se;
 
@@ -655,9 +652,6 @@ int nfc_set_remote_general_bytes(struct nfc_dev *dev, u8 *gb, u8 gb_len)
 {
        pr_debug("dev_name=%s gb_len=%d\n", dev_name(&dev->dev), gb_len);
 
-       if (gb_len > NFC_MAX_GT_LEN)
-               return -EINVAL;
-
        return nfc_llcp_set_remote_gb(dev, gb, gb_len);
 }
 EXPORT_SYMBOL(nfc_set_remote_general_bytes);