summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Lapuyade <eric.lapuyade@linux.intel.com>2013-09-19 16:52:06 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-09-25 02:02:30 +0200
commit645d5087bd9667ed398bcb4bfd8784e1de1ee693 (patch)
tree3165c1eb0008b4f75009ad5b2f120681edef6066
parent1c7a4c24fbfd99442cc6e14dc80fcb00f118e8b8 (diff)
downloadlinux-645d5087bd9667ed398bcb4bfd8784e1de1ee693.tar.gz
linux-645d5087bd9667ed398bcb4bfd8784e1de1ee693.tar.bz2
linux-645d5087bd9667ed398bcb4bfd8784e1de1ee693.zip
NFC: NCI: Store the spi device pointer from the spi instance
Storing the spi device was forgotten in the original implementation, which would pretty obviously cause some kind of serious crash when actually trying to send something through that device. Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--net/nfc/nci/spi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/nfc/nci/spi.c b/net/nfc/nci/spi.c
index 910dfd8015f4..5c2234024774 100644
--- a/net/nfc/nci/spi.c
+++ b/net/nfc/nci/spi.c
@@ -129,6 +129,7 @@ struct nci_spi *nci_spi_allocate_spi(struct spi_device *spi,
nspi->acknowledge_mode = acknowledge_mode;
nspi->xfer_udelay = delay;
+ nspi->spi = spi;
nspi->ndev = ndev;
return nspi;