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

Commit bd060ac0 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 fix from Wolfram Sang:
 "A bugfix for the I2C core fixing a (rare) race condition"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: core: fix NULL pointer dereference under race condition
parents ffbcbfca 147b36d5

drivers/i2c/i2c-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2179,6 +2179,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver) 
	/* add the driver to the list of i2c drivers in the driver core */

	driver->driver.owner = owner;

	driver->driver.bus = &i2c_bus_type;

	INIT_LIST_HEAD(&driver->clients);



	/* When registration returns, the driver core

	 * will have called probe() for all matching-but-unbound devices.
@@ -2189,7 +2190,6 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver) 


	pr_debug("driver [%s] registered\n", driver->driver.name);



	INIT_LIST_HEAD(&driver->clients);

	/* Walk the adapters that are already present */

	i2c_for_each_dev(driver, __process_new_driver);