UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFC: trf7970a: Unlock mutex before exiting trf7970a_irq() 

Recent changes to trf7970a_irq() added a couple return
paths that don't unlock the mutex that is locked when
the routine is entered.  Fix this by ensuring the mutex
is always unlocked before returning.

Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Mark A. Greer 2014-09-23 11:25:47 -07:00 committed by Samuel Ortiz
parent 55ef2e75cc
commit b9e3016a53
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/nfc/trf7970a.c
View File

@ -920,7 +920,7 @@ static irqreturn_t trf7970a_irq(int irq, void *dev_id)
TRF7970A_SPECIAL_FCN_REG1,
TRF7970A_SPECIAL_FCN_REG1_14_ANTICOLL);
if (ret)
return ret;
goto err_unlock_exit;
trf->special_fcn_reg1 =
TRF7970A_SPECIAL_FCN_REG1_14_ANTICOLL;
@ -933,7 +933,7 @@ static irqreturn_t trf7970a_irq(int irq, void *dev_id)
ret = trf7970a_write(trf, TRF7970A_ISO_CTRL,
iso_ctrl);
if (ret)
return ret;
goto err_unlock_exit;
trf->iso_ctrl = iso_ctrl;
}
@ -975,6 +975,7 @@ static irqreturn_t trf7970a_irq(int irq, void *dev_id)
__func__, trf->state);
}
err_unlock_exit:
mutex_unlock(&trf->lock);
return IRQ_HANDLED;
}