tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 26591188 c0f4d6d4

+7 -5
+2 -2
MAINTAINERS
··· 1984 1984 I2C/SMBUS STUB DRIVER 1985 1985 P: Mark M. Hoffman 1986 1986 M: mhoffman@lightlink.com 1987 - L: lm-sensors@lm-sensors.org 1987 + L: i2c@lm-sensors.org 1988 1988 S: Maintained 1989 1989 1990 1990 I2C SUBSYSTEM ··· 3726 3726 SIS 96X I2C/SMBUS DRIVER 3727 3727 P: Mark M. Hoffman 3728 3728 M: mhoffman@lightlink.com 3729 - L: lm-sensors@lm-sensors.org 3729 + L: i2c@lm-sensors.org 3730 3730 S: Maintained 3731 3731 3732 3732 SIS FRAMEBUFFER DRIVER
+2 -2
drivers/i2c/busses/i2c-powermac.c
··· 180 180 }; 181 181 182 182 183 - static int i2c_powermac_remove(struct platform_device *dev) 183 + static int __devexit i2c_powermac_remove(struct platform_device *dev) 184 184 { 185 185 struct i2c_adapter *adapter = platform_get_drvdata(dev); 186 186 struct pmac_i2c_bus *bus = i2c_get_adapdata(adapter); ··· 200 200 } 201 201 202 202 203 - static int __devexit i2c_powermac_probe(struct platform_device *dev) 203 + static int __devinit i2c_powermac_probe(struct platform_device *dev) 204 204 { 205 205 struct pmac_i2c_bus *bus = dev->dev.platform_data; 206 206 struct device_node *parent = NULL;
+3 -1
drivers/i2c/i2c-dev.c
··· 583 583 goto out; 584 584 585 585 i2c_dev_class = class_create(THIS_MODULE, "i2c-dev"); 586 - if (IS_ERR(i2c_dev_class)) 586 + if (IS_ERR(i2c_dev_class)) { 587 + res = PTR_ERR(i2c_dev_class); 587 588 goto out_unreg_chrdev; 589 + } 588 590 589 591 res = i2c_add_driver(&i2cdev_driver); 590 592 if (res)