* [patch -next] NFC: fix enable/disable confusion
@ 2013-06-17 22:48 Dan Carpenter
2013-06-24 12:38 ` Samuel Ortiz
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2013-06-17 22:48 UTC (permalink / raw)
To: kernel-janitors
There is a cut and paste bug so we enable a second time instead of
disabling.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index 7b1c186..3fdefc1 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch -next] NFC: fix enable/disable confusion
2013-06-17 22:48 [patch -next] NFC: fix enable/disable confusion Dan Carpenter
@ 2013-06-24 12:38 ` Samuel Ortiz
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2013-06-24 12:38 UTC (permalink / raw)
To: kernel-janitors
Hi Dan,
On Tue, Jun 18, 2013 at 01:48:26AM +0300, Dan Carpenter wrote:
> There is a cut and paste bug so we enable a second time instead of
> disabling.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
> index 7b1c186..3fdefc1 100644
> --- a/net/nfc/hci/core.c
> +++ b/net/nfc/hci/core.c
> @@ -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.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-24 12:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-17 22:48 [patch -next] NFC: fix enable/disable confusion Dan Carpenter
2013-06-24 12:38 ` Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox