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

Commit 031533b6 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

i2c: isch: Add missed 'else' 



commit 1db4da55070d6a2754efeb3743f5312fc32f5961 upstream.

In accordance with the existing comment and code analysis
it is quite likely that there is a missed 'else' when adapter
times out. Add it.

Fixes: 5bc12008 ("i2c: Add Intel SCH SMBus support")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: <stable@vger.kernel.org> # v2.6.27+
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64af4be2

drivers/i2c/busses/i2c-isch.c

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ static int sch_transaction(void) 
	if (retries > MAX_RETRIES) {

		dev_err(&sch_adapter.dev, "SMBus Timeout!\n");

		result = -ETIMEDOUT;

	}

	if (temp & 0x04) {

	} else if (temp & 0x04) {

		result = -EIO;

		dev_dbg(&sch_adapter.dev, "Bus collision! SMBus may be "

			"locked until next hard reset. (sorry!)\n");