Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c bugfixes from Wolfram Sang:
"A few driver bugfixes for 3.18"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: omap: fix i207 errata handling
i2c: designware: prevent early stop on TX FIFO empty
i2c: omap: fix NACK and Arbitration Lost irq handling
+6
-6
+1
-1
drivers/i2c/busses/i2c-designware-core.c
+1
-1
drivers/i2c/busses/i2c-designware-core.c
+5
-5
drivers/i2c/busses/i2c-omap.c
+5
-5
drivers/i2c/busses/i2c-omap.c
···
922
922
if (stat & OMAP_I2C_STAT_NACK) {
923
923
err |= OMAP_I2C_STAT_NACK;
924
924
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
925
-
break;
926
925
}
927
926
928
927
if (stat & OMAP_I2C_STAT_AL) {
929
928
dev_err(dev->dev, "Arbitration lost\n");
930
929
err |= OMAP_I2C_STAT_AL;
931
930
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);
932
-
break;
933
931
}
934
932
935
933
/*
···
952
954
if (dev->fifo_size)
953
955
num_bytes = dev->buf_len;
954
956
955
-
omap_i2c_receive_data(dev, num_bytes, true);
956
-
957
-
if (dev->errata & I2C_OMAP_ERRATA_I207)
957
+
if (dev->errata & I2C_OMAP_ERRATA_I207) {
958
958
i2c_omap_errata_i207(dev, stat);
959
+
num_bytes = (omap_i2c_read_reg(dev,
960
+
OMAP_I2C_BUFSTAT_REG) >> 8) & 0x3F;
961
+
}
959
962
963
+
omap_i2c_receive_data(dev, num_bytes, true);
960
964
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RDR);
961
965
continue;
962
966
}