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

Commit d79d3244 authored by Patrick Pannuto's avatar Patrick Pannuto Committed by Greg Kroah-Hartman
Browse files

driver core: platform: Use drv->driver.bus instead of assuming platform_bus_type 



In theory (although not *yet* in practice), a driver being passed
to platform_driver_probe might have driver.bus set to something
other than platform_bus_type. Locking drv->driver.bus is always
correct.

Signed-off-by: default avatarPatrick Pannuto <ppannuto@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6a5c083d

drivers/base/platform.c

+2 −2
Original line number Diff line number Diff line
@@ -488,12 +488,12 @@ int __init_or_module platform_driver_probe(struct platform_driver *drv, 
	 * if the probe was successful, and make sure any forced probes of

	 * new devices fail.

	 */

	spin_lock(&platform_bus_type.p->klist_drivers.k_lock);

	spin_lock(&drv->driver.bus->p->klist_drivers.k_lock);

	drv->probe = NULL;

	if (code == 0 && list_empty(&drv->driver.p->klist_devices.k_list))

		retval = -ENODEV;

	drv->driver.probe = platform_drv_probe_fail;

	spin_unlock(&platform_bus_type.p->klist_drivers.k_lock);

	spin_unlock(&drv->driver.bus->p->klist_drivers.k_lock);



	if (code != retval)

		platform_driver_unregister(drv);