git: 46e0c0379544 - main - twsi: use twsi_error() to handle wrong bus status when starting

The branch main has been updated by avg:

URL: https://cgit.FreeBSD.org/src/commit/?id=46e0c03795443675f95db6da2195825d24a9fb7c

commit 46e0c03795443675f95db6da2195825d24a9fb7c
Author:     Andriy Gapon <avg@FreeBSD.org>
AuthorDate: 2021-12-19 09:28:02 +0000
Commit:     Andriy Gapon <avg@FreeBSD.org>
CommitDate: 2021-12-19 10:05:52 +0000

    twsi: use twsi_error() to handle wrong bus status when starting
    
    MFC after:      1 week
---
 sys/dev/iicbus/twsi/twsi.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys/dev/iicbus/twsi/twsi.c b/sys/dev/iicbus/twsi/twsi.c
index 740c7e14a31f..91433f2cfe4a 100644
--- a/sys/dev/iicbus/twsi/twsi.c
+++ b/sys/dev/iicbus/twsi/twsi.c
@@ -480,6 +480,19 @@ out:
 	return (rv);
 }
 
+static void
+twsi_error(struct twsi_softc *sc, int err)
+{
+	/*
+	 * Must send stop condition to abort the current transfer.
+	 */
+	debugf(sc, "Sending STOP condition for error %d\n", err);
+	sc->transfer = 0;
+	sc->error = err;
+	sc->control_val = 0;
+	TWSI_WRITE(sc, sc->reg_control, sc->control_val | TWSI_CONTROL_STOP);
+}
+
 static int
 twsi_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs)
 {
@@ -501,9 +514,8 @@ twsi_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs)
 	debugf(sc, "status=0x%x\n", status);
 	if (status != TWSI_STATUS_IDLE) {
 		debugf(sc, "Bad status at start of transfer\n");
-		TWSI_WRITE(sc, sc->reg_control, TWSI_CONTROL_STOP);
-		mtx_unlock(&sc->mutex);
-		return (IIC_ESTATUS);
+		twsi_error(sc, IIC_ESTATUS);
+		goto end;
 	}
 
 	sc->nmsgs = nmsgs;
@@ -531,6 +543,7 @@ twsi_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs)
 	if (sc->error != 0)
 		debugf(sc, "Error: %d\n", sc->error);
 
+end:
 	/* Disable module and interrupts */
 	debugf(sc, "status=0x%x\n", TWSI_READ(sc, sc->reg_status));
 	TWSI_WRITE(sc, sc->reg_control, 0);
@@ -541,19 +554,6 @@ twsi_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs)
 	return (error);
 }
 
-static void
-twsi_error(struct twsi_softc *sc, int err)
-{
-	/*
-	 * Must send stop condition to abort the current transfer.
-	 */
-	debugf(sc, "Sending STOP condition for error %d\n", err);
-	sc->transfer = 0;
-	sc->error = err;
-	sc->control_val = 0;
-	TWSI_WRITE(sc, sc->reg_control, sc->control_val | TWSI_CONTROL_STOP);
-}
-
 static void
 twsi_intr(void *arg)
 {