diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2014-02-24 14:42:54 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-24 14:42:54 -0500 |
| commit | 1076182240a294830fb7acdb191e683df840baa7 (patch) | |
| tree | bcb9f0d9a4bd9116121a4b705b8bba9d2210d665 | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes (diff) | |
| parent | NFC: NCI: Fix NULL pointer dereference (diff) | |
| download | linux-dev-1076182240a294830fb7acdb191e683df840baa7.tar.xz linux-dev-1076182240a294830fb7acdb191e683df840baa7.zip | |
Merge tag 'nfc-fixes-3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes
Samuel Ortiz <sameo@linux.intel.com> says:
"NFC: 3.14: First pull request
We only have one candidate for 3.14 fixes, and this is a NCI NULL
pointer dereference introduced during the 3.14 merge window."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/nfc/nci/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 46bda010bf11..56db888b1cd5 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -301,7 +301,7 @@ static int nci_open_device(struct nci_dev *ndev) rc = __nci_request(ndev, nci_reset_req, 0, msecs_to_jiffies(NCI_RESET_TIMEOUT)); - if (ndev->ops->setup(ndev)) + if (ndev->ops->setup) ndev->ops->setup(ndev); if (!rc) { |