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

Commit 7b1ee96f authored by Christophe Ricard's avatar Christophe Ricard Committed by Peter Huewe
Browse files

tpm/tpm_i2c_stm_st33: Replace remaining r by ret 



Some places are still using r instead of ret.

Reviewed-by: default avatarJason Gunthorpe <jason.gunthorpe@obsidianresearch.com>
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
parent fc9ad777

drivers/char/tpm/tpm_i2c_stm_st33.c

+4 −4
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, 
			wait_queue_head_t *queue, bool check_cancel)

{

	unsigned long stop;

	int r;

	int ret;

	bool canceled = false;

	bool condition;

	u32 cur_intrs;
@@ -400,7 +400,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, 
		if ((long) timeout <= 0)

			return -1;



		r = wait_event_interruptible_timeout(*queue,

		ret = wait_event_interruptible_timeout(*queue,

					cur_intrs != tpm_dev->intrs, timeout);



		interrupt |= clear_interruption(tpm_dev);
@@ -408,12 +408,12 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, 
		condition = wait_for_tpm_stat_cond(chip, mask,

						   check_cancel, &canceled);



		if (r >= 0 && condition) {

		if (ret >= 0 && condition) {

			if (canceled)

				return -ECANCELED;

			return 0;

		}

		if (r == -ERESTARTSYS && freezing(current)) {

		if (ret == -ERESTARTSYS && freezing(current)) {

			clear_thread_flag(TIF_SIGPENDING);

			goto again;

		}