Skip to contentSkip to conversation

NFC: fix enable/disable confusion

PATCH Applied Dan Carpenter 2 participants 2 messages Jun 17, 2013 – Jun 24, 2013

Subsystems (3)
Networking Kernel janitors NFC
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 NFC: fix enable/disable confusion

There is a cut and paste bug so we enable a second time instead of disabling.

Signed-off-by Dan Carpenter <[email protected]>
net/nfc/hci/core.c +1 -1
index 7b1c186..3fdefc1 100644
@@ -717,7 +717,7 @@ static int hci_disable_se(struct nfc_dev *nfc_dev, u32 se_idx)
 	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
 
 	if (hdev->ops->disable_se)
-		return hdev->ops->enable_se(hdev, se_idx);
+		return hdev->ops->disable_se(hdev, se_idx);
 
 	return 0;
 }
Applied
#1 lore raw

Hi Dan,

Quoted 10 lines · Dan Carpenter

There is a cut and paste bug so we enable a second time instead of disabling.

Signed-off-by Dan Carpenter <[email protected]>
net/nfc/hci/core.c +0 -0
index 7b1c186..3fdefc1 100644

net/nfc/hci/core.c static int hci_disable_se(struct nfc_dev *nfc_dev, u32 se_idx) · line 723

Quoted 8 lines
net/nfc/hci/core.c +1 -1
@@ -717,7 +717,7 @@ static int hci_disable_se(struct nfc_dev *nfc_dev, u32 se_idx)
 	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
 
 	if (hdev->ops->disable_se)
-		return hdev->ops->enable_se(hdev, se_idx);
+		return hdev->ops->disable_se(hdev, se_idx);
 
 	return 0;
 }

Applied to nfc-fixes, thanks.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/