Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc0ae243 authored by Mark A. Greer's avatar Mark A. Greer Committed by Samuel Ortiz
Browse files

NFC: trf7970a: Unlock mutex before exiting _trf7970a_tg_listen() 



The recently added _trf7970a_tg_listen() routine
has some return paths that don't unlock the mutex
that is locked when the routine is entered.  Fix
this by always unlocking the mutex before returning.

Signed-off-by: default avatarMark A. Greer <mgreer@animalcreek.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent b9e3016a

drivers/nfc/trf7970a.c

+4 −4
Original line number Diff line number Diff line
@@ -1728,22 +1728,22 @@ static int _trf7970a_tg_listen(struct nfc_digital_dev *ddev, u16 timeout, 
			TRF7970A_RX_SPECIAL_SETTINGS_C424 |

			TRF7970A_RX_SPECIAL_SETTINGS_C212);

	if (ret)

		return ret;

		goto out_err;



	ret = trf7970a_write(trf, TRF7970A_REG_IO_CTRL,

			TRF7970A_REG_IO_CTRL_VRS(0x1));

	if (ret)

		return ret;

		goto out_err;



	ret = trf7970a_write(trf, TRF7970A_NFC_LOW_FIELD_LEVEL,

			TRF7970A_NFC_LOW_FIELD_LEVEL_RFDET(0x3));

	if (ret)

		return ret;

		goto out_err;



	ret = trf7970a_write(trf, TRF7970A_NFC_TARGET_LEVEL,

			TRF7970A_NFC_TARGET_LEVEL_RFDET(0x7));

	if (ret)

		return ret;

		goto out_err;



	trf->ddev = ddev;

	trf->cb = cb;