Commit 2fd6cbf4 authored by Russell King's avatar Russell King Committed by Wolfram Sang
Browse files

i2c: pxa: use master-abort for device probes 



Use master-abort to send the stop condition after an address cycle
rather than resetting the controller.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent e81c979f

drivers/i2c/busses/i2c-pxa.c

+2 −8
Original line number Diff line number Diff line
@@ -940,14 +940,8 @@ static void i2c_pxa_irq_txempty(struct pxa_i2c *i2c, u32 isr) 
		icr &= ~ICR_ALDIE;

		icr |= ICR_START | ICR_TB;

	} else {

		if (i2c->msg->len == 0) {

			/*

			 * Device probes have a message length of zero

			 * and need the bus to be reset before it can

			 * be used again.

			 */

			i2c_pxa_reset(i2c);

		}

		if (i2c->msg->len == 0)

			icr |= ICR_MA;

		i2c_pxa_master_complete(i2c, 0);

	}