The patch titled i2c-pxa.c: timeouts off by 1 has been removed from the -mm tree. Its filename was i2c-pxac-timeouts-off-by-1.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: i2c-pxa.c: timeouts off by 1 From: Roel Kluin <roel.kluin@xxxxxxxxx> With `while (timeout--)' timeout reaches -1 after the loop, so the tests below are off by one. Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> Cc: Jean Delvare <khali@xxxxxxxxxxxx> Cc: Ben Dooks <ben-linux@xxxxxxxxx> Acked-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> Cc: Mike Rapoport <mike@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/i2c/busses/i2c-pxa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/i2c/busses/i2c-pxa.c~i2c-pxac-timeouts-off-by-1 drivers/i2c/busses/i2c-pxa.c --- a/drivers/i2c/busses/i2c-pxa.c~i2c-pxac-timeouts-off-by-1 +++ a/drivers/i2c/busses/i2c-pxa.c @@ -279,10 +279,10 @@ static int i2c_pxa_wait_bus_not_busy(str show_state(i2c); } - if (timeout <= 0) + if (timeout < 0) show_state(i2c); - return timeout <= 0 ? I2C_RETRY : 0; + return timeout < 0 ? I2C_RETRY : 0; } static int i2c_pxa_wait_master(struct pxa_i2c *i2c) @@ -626,7 +626,7 @@ static int i2c_pxa_pio_set_master(struct show_state(i2c); } - if (timeout <= 0) { + if (timeout < 0) { show_state(i2c); dev_err(&i2c->adap.dev, "i2c_pxa: timeout waiting for bus free\n"); _ Patches currently in -mm which might be from roel.kluin@xxxxxxxxx are origin.patch asm-generic-fix-local_add_unless-macro.patch linux-next.patch drm-fix-lock_test_with_return-macro.patch v4l-dvb-cimax2c-fix-typo.patch zoran-fix-error.patch uwb-event_size-should-be-signed.patch isdn-get_free_devid-failure-ignored.patch scsi-ncr53c8xx-div-reaches-1.patch scsi-pcmcia-nsp_cs-time_out-reaches-1.patch wis-sony-tunerc-typo.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch alpha-bad-macro-expansion-parameter-is-member.patch m68k-count-can-reach-51-not-50.patch uml-bad-macro-expansion-parameter-is-member.patch serial-z85c30-bcm1480-loops-reach-1.patch spi_bfin5xx-limit-reaches-1.patch ufs-sector_t-cannot-be-negative.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html