public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
From: Samuel Ortiz <sameo@linux.intel.com>
To: kernel-janitors@vger.kernel.org
Subject: Re: [patch -next] NFC: fix enable/disable confusion
Date: Mon, 24 Jun 2013 12:38:00 +0000	[thread overview]
Message-ID: <20130624123800.GE30838@zurbaran> (raw)
In-Reply-To: <20130617224826.GA1562@elgon.mountain>

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/

      reply	other threads:[~2013-06-24 12:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-17 22:48 [patch -next] NFC: fix enable/disable confusion Dan Carpenter
2013-06-24 12:38 ` Samuel Ortiz [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130624123800.GE30838@zurbaran \
    --to=sameo@linux.intel.com \
    --cc=kernel-janitors@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox