History

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang: "I2C has a driver bugfix and a MAINTAINERS fix" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: MAINTAINERS: Karthikeyan Ramasubramanian is MIA i2c: xiic: Add max_read_len quirk

Linus Torvalds committed 7 years ago

Commit 902b2ed2 parents 66b59f2 8f772932 files · +5 −1Browse files

Unified · Split

2 files
  1. MAINTAINERS +0 −1
  2. drivers/i2c/busses/i2c-xiic.c +5 −0
MAINTAINERS+0−1
@@ -13057,7 +13057,6 @@ F: Documentation/devicetree/bindings/net/qcom,dwmac.txt · 13056 unmodified lines
13057 13057
13058QUALCOMM GENERIC INTERFACE I2C DRIVER13058QUALCOMM GENERIC INTERFACE I2C DRIVER
13059M: Alok Chauhan <alokc@codeaurora.org>13059M: Alok Chauhan <alokc@codeaurora.org>
13060M: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
13061L: linux-i2c@vger.kernel.org13060L: linux-i2c@vger.kernel.org
13062L: linux-arm-msm@vger.kernel.org13061L: linux-arm-msm@vger.kernel.org
13063S: Supported13062S: Supported
drivers/i2c/busses/i2c-xiic.c+5−0
@@ -709,11 +709,16 @@ static const struct i2c_algorithm xiic_algorithm = { · 708 unmodified lines
709 .functionality = xiic_func,709 .functionality = xiic_func,
710};710};
711 711
712static const struct i2c_adapter_quirks xiic_quirks = {
713 .max_read_len = 255,
714};
715
712static const struct i2c_adapter xiic_adapter = {716static const struct i2c_adapter xiic_adapter = {
713 .owner = THIS_MODULE,717 .owner = THIS_MODULE,
714 .name = DRIVER_NAME,718 .name = DRIVER_NAME,
715 .class = I2C_CLASS_DEPRECATED,719 .class = I2C_CLASS_DEPRECATED,
716 .algo = &xiic_algorithm,720 .algo = &xiic_algorithm,
721 .quirks = &xiic_quirks,
717};722};
718 723
719 724

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t