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

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

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
parents 9b7b819c 8d487a43

drivers/i2c/busses/i2c-hix5hd2.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/i2c/busses/i2c-s3c2410.c

+1 −0
Original line number Diff line number Diff line
@@ -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