Merge tag 'devicetree-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[cascardo/linux.git] / net / nfc / digital_technology.c

diff --git a/net/nfc/digital_technology.c b/net/nfc/digital_technology.c
index fb58ed2..d9080de 100644 (file)
--- a/net/nfc/digital_technology.c
+++ b/net/nfc/digital_technology.c
@@ -1257,21 +1257,12 @@ static int digital_tg_config_nfcf(struct nfc_digital_dev *ddev, u8 rf_tech)
 int digital_tg_listen_nfcf(struct nfc_digital_dev *ddev, u8 rf_tech)
 {
        int rc;
-       u8 *nfcid2;
 
        rc = digital_tg_config_nfcf(ddev, rf_tech);
        if (rc)
                return rc;
 
-       nfcid2 = kzalloc(NFC_NFCID2_MAXSIZE, GFP_KERNEL);
-       if (!nfcid2)
-               return -ENOMEM;
-
-       nfcid2[0] = DIGITAL_SENSF_NFCID2_NFC_DEP_B1;
-       nfcid2[1] = DIGITAL_SENSF_NFCID2_NFC_DEP_B2;
-       get_random_bytes(nfcid2 + 2, NFC_NFCID2_MAXSIZE - 2);
-
-       return digital_tg_listen(ddev, 300, digital_tg_recv_sensf_req, nfcid2);
+       return digital_tg_listen(ddev, 300, digital_tg_recv_sensf_req, NULL);
 }
 
 void digital_tg_recv_md_req(struct nfc_digital_dev *ddev, void *arg,