Commit 10761822 authored by John W. Linville's avatar John W. Linville
Browse files

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: default avatarJohn W. Linville <linville@tuxdriver.com>
parents 694d82d9 44a589ca

net/nfc/nci/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {