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-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c bug fixes from Wolfram Sang:
"Two small bugfixes for I2C"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: s3c2410: fix oops in suspend callback for non-dt platforms
i2c: hix5hd2: Fix modalias to make module auto-loading work

Linus Torvalds dc2c6eb6 9b7b819c

+2 -1
+1 -1
drivers/i2c/busses/i2c-hix5hd2.c
··· 554 554 MODULE_DESCRIPTION("Hix5hd2 I2C Bus driver"); 555 555 MODULE_AUTHOR("Wei Yan <sledge.yanwei@huawei.com>"); 556 556 MODULE_LICENSE("GPL"); 557 - MODULE_ALIAS("platform:i2c-hix5hd2"); 557 + MODULE_ALIAS("platform:hix5hd2-i2c");
+1
drivers/i2c/busses/i2c-s3c2410.c
··· 1143 1143 return -ENOMEM; 1144 1144 1145 1145 i2c->quirks = s3c24xx_get_device_quirks(pdev); 1146 + i2c->sysreg = ERR_PTR(-ENOENT); 1146 1147 if (pdata) 1147 1148 memcpy(i2c->pdata, pdata, sizeof(*pdata)); 1148 1149 else