The patch titled i2c: fix off-by-one in {piix4,vt596}_transaction() has been removed from the -mm tree. Its filename was i2c-fix-off-by-one-in-piix4vt596_transaction.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: i2c: fix off-by-one in {piix4,vt596}_transaction() From: Roel Kluin <roel.kluin@xxxxxxxxx> With `while (timeout++ < MAX_TIMEOUT)' timeout reaches MAX_TIMEOUT + 1 after the loop This is probably unlikely to produce a problem. Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> Cc: Jean Delvare <khali@xxxxxxxxxxxx> Cc: Ben Dooks <ben-linux@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/i2c/busses/i2c-piix4.c | 2 +- drivers/i2c/busses/i2c-viapro.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/i2c/busses/i2c-piix4.c~i2c-fix-off-by-one-in-piix4vt596_transaction drivers/i2c/busses/i2c-piix4.c --- a/drivers/i2c/busses/i2c-piix4.c~i2c-fix-off-by-one-in-piix4vt596_transaction +++ a/drivers/i2c/busses/i2c-piix4.c @@ -329,7 +329,7 @@ static int piix4_transaction(void) msleep(1); /* If the SMBus is still busy, we give up */ - if (timeout >= MAX_TIMEOUT) { + if (timeout > MAX_TIMEOUT) { dev_err(&piix4_adapter.dev, "SMBus Timeout!\n"); result = -ETIMEDOUT; } diff -puN drivers/i2c/busses/i2c-viapro.c~i2c-fix-off-by-one-in-piix4vt596_transaction drivers/i2c/busses/i2c-viapro.c --- a/drivers/i2c/busses/i2c-viapro.c~i2c-fix-off-by-one-in-piix4vt596_transaction +++ a/drivers/i2c/busses/i2c-viapro.c @@ -168,7 +168,7 @@ static int vt596_transaction(u8 size) } while ((temp & 0x01) && (timeout++ < MAX_TIMEOUT)); /* If the SMBus is still busy, we give up */ - if (timeout >= MAX_TIMEOUT) { + if (timeout > MAX_TIMEOUT) { result = -ETIMEDOUT; dev_err(&vt596_adapter.dev, "SMBus timeout!\n"); } _ Patches currently in -mm which might be from roel.kluin@xxxxxxxxx are origin.patch zlib-optimize-inffast-when-copying-direct-from-output.patch linux-next.patch omap-confusion-in-iommu_put.patch omap3-add-missing-parentheses.patch powerpc-sky-cpu-redundant-or-incorrect-tests-on-unsigned.patch i2c-fix-off-by-one-in-piix4vt596_transaction.patch hisax-timeout-off-by-one-in-waitrecmsg.patch drivers-scsi-fnic-fnic_scsic-clean-up.patch ibmmca-buffer-overflow.patch scsi-eata-fix-buffer-overflow.patch drivers-scsi-gdthc-fix-buffer-overflow.patch drivers-scsi-u14-34fc-fix-uffer-overflow.patch drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch osst-fix-read-buffer-overflow.patch gdth-unmap-ccb_phys-when-scsi_add_host-fails-in-gdth_eisa_probe_one.patch zfcp-test-kmalloc-failure-in-scsi_get_vpd_page.patch ncr5380-bit-mr_dma_mode-set-twice-in-ncr5380_transfer_dma.patch scsi-pmcraid-redundant-check-in-pmcraid_check_ioctl_buffer.patch dc395x-decrease-iteration-for-tag_number-of-max_command-in-start_scsi.patch paride-fix-off-by-one-test.patch ieee80211-add-missing-parentheses.patch rt2860-test-off-by-one-in-rtmpasicsendcommandtomcu.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch cryptocop-fix-assertion-in-create_output_descriptors.patch asiliantfb-fix-test-of-unsigned-in-asiliant_calc_dclk2.patch w1-fix-test-in-ds2482_wait_1wire_idle.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