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

Commit 26591188 authored Sep 24, 2008 by Linus Torvalds

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Fix mailing lists in two MAINTAINERS entries
  i2c-dev: Return correct error code on class_create() failure
  i2c-powermac: Fix section for probe and remove functions

parents c0f4d6d4 17a172fe

MAINTAINERS

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1984,7 +1984,7 @@ S: Maintained
	I2C/SMBUS STUB DRIVER		I2C/SMBUS STUB DRIVER
	P: Mark M. Hoffman		P: Mark M. Hoffman
	M: mhoffman@lightlink.com		M: mhoffman@lightlink.com
	L: lm-sensors@lm-sensors.org		L: i2c@lm-sensors.org
	S: Maintained		S: Maintained

	I2C SUBSYSTEM		I2C SUBSYSTEM
	@@ -3726,7 +3726,7 @@ S: Maintained
	SIS 96X I2C/SMBUS DRIVER		SIS 96X I2C/SMBUS DRIVER
	P: Mark M. Hoffman		P: Mark M. Hoffman
	M: mhoffman@lightlink.com		M: mhoffman@lightlink.com
	L: lm-sensors@lm-sensors.org		L: i2c@lm-sensors.org
	S: Maintained		S: Maintained

	SIS FRAMEBUFFER DRIVER		SIS FRAMEBUFFER DRIVER

drivers/i2c/busses/i2c-powermac.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -180,7 +180,7 @@ static const struct i2c_algorithm i2c_powermac_algorithm = {
	};		};


	static int i2c_powermac_remove(struct platform_device *dev)		static int __devexit i2c_powermac_remove(struct platform_device *dev)
	{		{
	struct i2c_adapter *adapter = platform_get_drvdata(dev);		struct i2c_adapter *adapter = platform_get_drvdata(dev);
	struct pmac_i2c_bus *bus = i2c_get_adapdata(adapter);		struct pmac_i2c_bus *bus = i2c_get_adapdata(adapter);
	@@ -200,7 +200,7 @@ static int i2c_powermac_remove(struct platform_device *dev)
	}		}


	static int __devexit i2c_powermac_probe(struct platform_device *dev)		static int __devinit i2c_powermac_probe(struct platform_device *dev)
	{		{
	struct pmac_i2c_bus *bus = dev->dev.platform_data;		struct pmac_i2c_bus *bus = dev->dev.platform_data;
	struct device_node *parent = NULL;		struct device_node *parent = NULL;

drivers/i2c/i2c-dev.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -583,8 +583,10 @@ static int __init i2c_dev_init(void)
	goto out;		goto out;

	i2c_dev_class = class_create(THIS_MODULE, "i2c-dev");		i2c_dev_class = class_create(THIS_MODULE, "i2c-dev");
	if (IS_ERR(i2c_dev_class))		if (IS_ERR(i2c_dev_class)) {
			res = PTR_ERR(i2c_dev_class);
	goto out_unreg_chrdev;		goto out_unreg_chrdev;
			}

	res = i2c_add_driver(&i2cdev_driver);		res = i2c_add_driver(&i2cdev_driver);
	if (res)		if (res)