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 819b87702b7039ceed68085139d2820a2d5711c0..cff3f1614ad4557ff178804acb55bacbad328149 100644 (file)
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -555,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;
 
@@ -605,7 +604,6 @@ error:
 
 int nfc_disable_se(struct nfc_dev *dev, u32 se_idx)
 {
-
        struct nfc_se *se;
        int rc;
 
@@ -934,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);