iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFC: NCI: zero struct spi_transfer variables before usage

Browse Source 
Using ARM compiler, and without zero-ing spi_transfer, spi-s3c64xx
driver would issue abnormal errors due to bpw field value being set to
unexpected value. This structure MUST be set to all zeros except for
those field specifically used.

Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Eric Lapuyade 2013-09-23 18:02:43 +02:00 committed by Samuel Ortiz
parent 5ce3f32b52
commit a4ada6cadb
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/nfc/nci/spi.c
View File

@ -44,6 +44,7 @@ static int __nci_spi_send(struct nci_spi *nspi, struct sk_buff *skb)
struct spi_message m; struct spi_message m;
struct spi_transfer t; struct spi_transfer t;
memset(&t, 0, sizeof(struct spi_transfer));
t.tx_buf = skb->data; t.tx_buf = skb->data;
t.len = skb->len; t.len = skb->len;
t.cs_change = 0; t.cs_change = 0;
@ -173,16 +174,21 @@ static struct sk_buff *__nci_spi_recv_frame(struct nci_spi *nspi)
int ret; int ret;
spi_message_init(&m); spi_message_init(&m);
memset(&tx, 0, sizeof(struct spi_transfer));
req[0] = NCI_SPI_DIRECT_READ; req[0] = NCI_SPI_DIRECT_READ;
req[1] = nspi->acknowledge_mode; req[1] = nspi->acknowledge_mode;
tx.tx_buf = req; tx.tx_buf = req;
tx.len = 2; tx.len = 2;
tx.cs_change = 0; tx.cs_change = 0;
spi_message_add_tail(&tx, &m); spi_message_add_tail(&tx, &m);
memset(&rx, 0, sizeof(struct spi_transfer));
rx.rx_buf = resp_hdr; rx.rx_buf = resp_hdr;
rx.len = 2; rx.len = 2;
rx.cs_change = 1; rx.cs_change = 1;
spi_message_add_tail(&rx, &m); spi_message_add_tail(&rx, &m);
ret = spi_sync(nspi->spi, &m); ret = spi_sync(nspi->spi, &m);
if (ret) if (ret)
@ -199,11 +205,14 @@ static struct sk_buff *__nci_spi_recv_frame(struct nci_spi *nspi)
return NULL; return NULL;
spi_message_init(&m); spi_message_init(&m);
memset(&rx, 0, sizeof(struct spi_transfer));
rx.rx_buf = skb_put(skb, rx_len); rx.rx_buf = skb_put(skb, rx_len);
rx.len = rx_len; rx.len = rx_len;
rx.cs_change = 0; rx.cs_change = 0;
rx.delay_usecs = nspi->xfer_udelay; rx.delay_usecs = nspi->xfer_udelay;
spi_message_add_tail(&rx, &m); spi_message_add_tail(&rx, &m);
ret = spi_sync(nspi->spi, &m); ret = spi_sync(nspi->spi, &m);
if (ret) if (ret)