Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8017454 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

Pill i2c fixes from Jean Delvare.

Well, "fixes"..  The biggest patch here is actually Jan marking Wolfram
Sang as the main i2c subsystem maintainer, with Jan staying on as the PC
controller maintainer.

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-mux-pinctrl: Fix probe error path
  MAINTAINERS: i2c: 7 years, this is it
parents 7c96cfcd aa1e3e81

MAINTAINERS

+51 −9
Original line number Diff line number Diff line
@@ -3598,6 +3598,49 @@ F: drivers/hid/hid-hyperv.c 
F:	drivers/net/hyperv/

F:	drivers/staging/hv/



I2C OVER PARALLEL PORT

M:	Jean Delvare <khali@linux-fr.org>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	Documentation/i2c/busses/i2c-parport

F:	Documentation/i2c/busses/i2c-parport-light

F:	drivers/i2c/busses/i2c-parport.c

F:	drivers/i2c/busses/i2c-parport-light.c



I2C/SMBUS CONTROLLER DRIVERS FOR PC

M:	Jean Delvare <khali@linux-fr.org>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	Documentation/i2c/busses/i2c-ali1535

F:	Documentation/i2c/busses/i2c-ali1563

F:	Documentation/i2c/busses/i2c-ali15x3

F:	Documentation/i2c/busses/i2c-amd756

F:	Documentation/i2c/busses/i2c-amd8111

F:	Documentation/i2c/busses/i2c-i801

F:	Documentation/i2c/busses/i2c-nforce2

F:	Documentation/i2c/busses/i2c-piix4

F:	Documentation/i2c/busses/i2c-sis5595

F:	Documentation/i2c/busses/i2c-sis630

F:	Documentation/i2c/busses/i2c-sis96x

F:	Documentation/i2c/busses/i2c-via

F:	Documentation/i2c/busses/i2c-viapro

F:	drivers/i2c/busses/i2c-ali1535.c

F:	drivers/i2c/busses/i2c-ali1563.c

F:	drivers/i2c/busses/i2c-ali15x3.c

F:	drivers/i2c/busses/i2c-amd756.c

F:	drivers/i2c/busses/i2c-amd756-s4882.c

F:	drivers/i2c/busses/i2c-amd8111.c

F:	drivers/i2c/busses/i2c-i801.c

F:	drivers/i2c/busses/i2c-isch.c

F:	drivers/i2c/busses/i2c-nforce2.c

F:	drivers/i2c/busses/i2c-nforce2-s4985.c

F:	drivers/i2c/busses/i2c-piix4.c

F:	drivers/i2c/busses/i2c-sis5595.c

F:	drivers/i2c/busses/i2c-sis630.c

F:	drivers/i2c/busses/i2c-sis96x.c

F:	drivers/i2c/busses/i2c-via.c

F:	drivers/i2c/busses/i2c-viapro.c



I2C/SMBUS STUB DRIVER

M:	"Mark M. Hoffman" <mhoffman@lightlink.com>

L:	linux-i2c@vger.kernel.org
@@ -3605,9 +3648,8 @@ S: Maintained 
F:	drivers/i2c/busses/i2c-stub.c



I2C SUBSYSTEM

M:	"Jean Delvare (PC drivers, core)" <khali@linux-fr.org>

M:	Wolfram Sang <w.sang@pengutronix.de>

M:	"Ben Dooks (embedded platforms)" <ben-linux@fluff.org>

M:	"Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>

L:	linux-i2c@vger.kernel.org

W:	http://i2c.wiki.kernel.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
@@ -3618,6 +3660,13 @@ F: drivers/i2c/ 
F:	include/linux/i2c.h

F:	include/linux/i2c-*.h



I2C-TAOS-EVM DRIVER

M:	Jean Delvare <khali@linux-fr.org>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	Documentation/i2c/busses/i2c-taos-evm

F:	drivers/i2c/busses/i2c-taos-evm.c



I2C-TINY-USB DRIVER

M:	Till Harbaum <till@harbaum.org>

L:	linux-i2c@vger.kernel.org
@@ -7887,13 +7936,6 @@ M: Roger Luethi <rl@hellgate.ch> 
S:	Maintained

F:	drivers/net/ethernet/via/via-rhine.c



VIAPRO SMBUS DRIVER

M:	Jean Delvare <khali@linux-fr.org>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	Documentation/i2c/busses/i2c-viapro

F:	drivers/i2c/busses/i2c-viapro.c



VIA SD/MMC CARD CONTROLLER DRIVER

M:	Bruce Chang <brucechang@via.com.tw>

M:	Harald Welte <HaraldWelte@viatech.com>

drivers/i2c/muxes/i2c-mux-pinctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int __devinit i2c_mux_pinctrl_probe(struct platform_device *pdev) 
	mux->busses = devm_kzalloc(&pdev->dev,

				   sizeof(mux->busses) * mux->pdata->bus_count,

				   GFP_KERNEL);

	if (!mux->states) {

	if (!mux->busses) {

		dev_err(&pdev->dev, "Cannot allocate busses\n");

		ret = -ENOMEM;

		goto err;