diff options
| author | Vincent Cuissard <cuissard@marvell.com> | 2015-10-26 12:27:41 +0300 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-10-27 06:21:14 +0300 |
| commit | b5b3e23e4cace008e1a30e8614a484d14dfd07a1 (patch) | |
| tree | 451bd798e76313fb43dc654530374d4b3c6e3d5c /drivers/nfc/nfcmrvl/main.c | |
| parent | 58d34aa677ec248539262c54a618d61804a893f1 (diff) | |
| download | linux-b5b3e23e4cace008e1a30e8614a484d14dfd07a1.tar.xz | |
NFC: nfcmrvl: add i2c driver
This driver adds the support of I2C-based Marvell NFC controller.
Signed-off-by: Vincent Cuissard <cuissard@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/nfcmrvl/main.c')
| -rw-r--r-- | drivers/nfc/nfcmrvl/main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c index a24a7ca9f33d..0c27de60a6bd 100644 --- a/drivers/nfc/nfcmrvl/main.c +++ b/drivers/nfc/nfcmrvl/main.c @@ -33,6 +33,9 @@ static int nfcmrvl_nci_open(struct nci_dev *ndev) if (test_and_set_bit(NFCMRVL_NCI_RUNNING, &priv->flags)) return 0; + /* Reset possible fault of previous session */ + clear_bit(NFCMRVL_PHY_ERROR, &priv->flags); + err = priv->if_ops->nci_open(priv); if (err) @@ -226,10 +229,8 @@ EXPORT_SYMBOL_GPL(nfcmrvl_nci_recv_frame); void nfcmrvl_chip_reset(struct nfcmrvl_private *priv) { - /* - * This function does not take care if someone is using the device. - * To be improved. - */ + /* Reset possible fault of previous session */ + clear_bit(NFCMRVL_PHY_ERROR, &priv->flags); if (priv->config.reset_n_io) { nfc_info(priv->dev, "reset the chip\n"); |