summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@animalcreek.com>2014-09-02 15:12:40 -0700
committerSamuel Ortiz <sameo@linux.intel.com>2014-09-07 23:13:45 +0200
commitcfc708dbe4022324bcd2bcb5817dd29f1f91299d (patch)
tree79827bcc8eb985213dc70459b0b55c7d7e01bacc /drivers
parent307e5caf6fb1dac1b9cfa1d78138d77e46517b56 (diff)
NFC: trf7970a: Don't turn off RF if its already off
Don't try to turn off of RF transmitter is its already off. Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nfc/trf7970a.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index e4671e54424a..429146b7e6d8 100644
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@ -859,6 +859,10 @@ err_out:
static void trf7970a_switch_rf_off(struct trf7970a *trf)
{
+ if ((trf->state == TRF7970A_ST_PWR_OFF) ||
+ (trf->state == TRF7970A_ST_RF_OFF))
+ return;
+
dev_dbg(trf->dev, "Switching rf off\n");
trf->chip_status_ctrl &= ~TRF7970A_CHIP_STATUS_RF_ON;