diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-05 09:54:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-05 09:54:43 -0700 |
| commit | dc2c6eb6f781b42c904ef3e90ea79f30afb68fe5 (patch) | |
| tree | 7bf5d11aee0efed70b6041380e5bcfa64c549a78 | |
| parent | compat: cleanup coding in compat_get_bitmap() and compat_put_bitmap() (diff) | |
| parent | i2c: s3c2410: fix oops in suspend callback for non-dt platforms (diff) | |
| download | linux-dev-dc2c6eb6f781b42c904ef3e90ea79f30afb68fe5.tar.xz linux-dev-dc2c6eb6f781b42c904ef3e90ea79f30afb68fe5.zip | |
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
| -rw-r--r-- | drivers/i2c/busses/i2c-hix5hd2.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-hix5hd2.c b/drivers/i2c/busses/i2c-hix5hd2.c index 8fe78d08e01c..7c6966434ee7 100644 --- a/drivers/i2c/busses/i2c-hix5hd2.c +++ b/drivers/i2c/busses/i2c-hix5hd2.c @@ -554,4 +554,4 @@ module_platform_driver(hix5hd2_i2c_driver); MODULE_DESCRIPTION("Hix5hd2 I2C Bus driver"); MODULE_AUTHOR("Wei Yan <sledge.yanwei@huawei.com>"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:i2c-hix5hd2"); +MODULE_ALIAS("platform:hix5hd2-i2c"); diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 958c8db4ec30..297e9c9ac943 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1143,6 +1143,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) return -ENOMEM; i2c->quirks = s3c24xx_get_device_quirks(pdev); + i2c->sysreg = ERR_PTR(-ENOENT); if (pdata) memcpy(i2c->pdata, pdata, sizeof(*pdata)); else |