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

Commit d8938c98 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-tda9950-fixes' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-fixes 



two tda9950 fixes.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Russell King <rmk@armlinux.org.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20181001162948.GA9508@rmk-PC.armlinux.org.uk
parents 659c9370 e0dccce1

drivers/gpu/drm/i2c/tda9950.c

+3 −2
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ static irqreturn_t tda9950_irq(int irq, void *data) 
			break;

		}

		/* TDA9950 executes all retries for us */

		if (tx_status != CEC_TX_STATUS_OK)

			tx_status |= CEC_TX_STATUS_MAX_RETRIES;

		cec_transmit_done(priv->adap, tx_status, arb_lost_cnt,

				  nack_cnt, 0, err_cnt);
@@ -310,7 +311,7 @@ static void tda9950_release(struct tda9950_priv *priv) 
	/* Wait up to .5s for it to signal non-busy */

	do {

		csr = tda9950_read(client, REG_CSR);

		if (!(csr & CSR_BUSY) || --timeout)

		if (!(csr & CSR_BUSY) || !--timeout)

			break;

		msleep(10);

	} while (1);