From 3f54094daa51f1804eca3927ccee5fbffae23280 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Thu, 4 Oct 2012 15:15:46 +0200 Subject: [PATCH] --- yaml --- r: 340943 b: refs/heads/master c: f9fc36f46f7dddb19b4facf8d9e4a792b54eba53 h: refs/heads/master i: 340941: f61d705d389da8709fcd794a4601ee1d7b89c09a 340939: 0b4bf3af39a6f2ffd7a3c187adce69cb2f4b1d79 340935: 32e1b7e6d9e52b1a626b23e16202a7a321398b9a 340927: 6a2e4a19504879215756c3d82dd543cbecf49217 v: v3 --- [refs] | 2 +- trunk/net/nfc/nci/core.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index dfef7afb96cc..0e3501193ab2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 460d8f970e44c2d8fc24ab622ff433295a6cedd8 +refs/heads/master: f9fc36f46f7dddb19b4facf8d9e4a792b54eba53 diff --git a/trunk/net/nfc/nci/core.c b/trunk/net/nfc/nci/core.c index 77f49490e4ca..abc864b90411 100644 --- a/trunk/net/nfc/nci/core.c +++ b/trunk/net/nfc/nci/core.c @@ -414,11 +414,11 @@ static int nci_set_local_general_bytes(struct nfc_dev *nfc_dev) struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); struct nci_set_config_param param; __u8 local_gb[NFC_MAX_GT_LEN]; - int i, rc = 0; + int i; param.val = nfc_get_local_general_bytes(nfc_dev, ¶m.len); if ((param.val == NULL) || (param.len == 0)) - return rc; + return 0; if (param.len > NFC_MAX_GT_LEN) return -EINVAL; @@ -429,10 +429,8 @@ static int nci_set_local_general_bytes(struct nfc_dev *nfc_dev) param.id = NCI_PN_ATR_REQ_GEN_BYTES; param.val = local_gb; - rc = nci_request(ndev, nci_set_config_req, (unsigned long)¶m, - msecs_to_jiffies(NCI_SET_CONFIG_TIMEOUT)); - - return rc; + return nci_request(ndev, nci_set_config_req, (unsigned long)¶m, + msecs_to_jiffies(NCI_SET_CONFIG_TIMEOUT)); } static int nci_start_poll(struct nfc_dev *nfc_dev,