Merge branch 'x15-audio-fixes' into omap-for-v4.4/fixes

[firefly-linux-kernel-4.4.55.git] / drivers / nfc / nfcmrvl / main.c

diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 0c27de60a6bd4d0614769530adcf6b9c0c0d9b45..8079ae0de21ebac54153e7202bb469ae413ed765 100644 (file)
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -132,7 +132,11 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
                        nfc_err(dev, "failed to request reset_n io\n");
        }
 
-       headroom = tailroom = 0;
+       if (phy == NFCMRVL_PHY_SPI) {
+               headroom = NCI_SPI_HDR_LEN;
+               tailroom = 1;
+       } else
+               headroom = tailroom = 0;
 
        if (priv->config.hci_muxed)
                headroom += NFCMRVL_HCI_EVENT_HEADER_SIZE;