Merge remote-tracking branches 'asoc/topic/4554', 'asoc/topic/ab8500', 'asoc/topic...

[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..cff3f1614ad4557ff178804acb55bacbad328149 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;
 
@@ -558,7 +555,6 @@ EXPORT_SYMBOL(nfc_find_se);
 
 int nfc_enable_se(struct nfc_dev *dev, u32 se_idx)
 {
-
        struct nfc_se *se;
        int rc;
 
@@ -608,7 +604,6 @@ error:
 
 int nfc_disable_se(struct nfc_dev *dev, u32 se_idx)
 {
-
        struct nfc_se *se;
        int rc;
 
@@ -655,9 +650,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);
@@ -940,6 +932,27 @@ int nfc_remove_se(struct nfc_dev *dev, u32 se_idx)
 }
 EXPORT_SYMBOL(nfc_remove_se);
 
+int nfc_se_transaction(struct nfc_dev *dev, u8 se_idx,
+                      struct nfc_evt_transaction *evt_transaction)
+{
+       int rc;
+
+       pr_debug("transaction: %x\n", se_idx);
+
+       device_lock(&dev->dev);
+
+       if (!evt_transaction) {
+               rc = -EPROTO;
+               goto out;
+       }
+
+       rc = nfc_genl_se_transaction(dev, se_idx, evt_transaction);
+out:
+       device_unlock(&dev->dev);
+       return rc;
+}
+EXPORT_SYMBOL(nfc_se_transaction);
+
 static void nfc_release(struct device *d)
 {
        struct nfc_dev *dev = to_nfc_dev(d);