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

Commit 57eee3d2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Greg Kroah-Hartman
Browse files

Driver core: Call device_pm_add() after bus_add_device() in device_add() 



Include dpm_sysfs_add() into device_pm_add(), in analogy with
device_pm_remove(), and modify device_add() to call the latter after
bus_add_device(), to avoid situations in which the PM core may
attempt to suspend a device the registration of which has not been
successful.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 58aca232

drivers/base/core.c

+5 −10
Original line number Original line Diff line number Diff line
@@ -817,17 +817,12 @@ int device_add(struct device *dev) 
	error = device_add_attrs(dev);

	error = device_add_attrs(dev);

	if (error)

	if (error)

		goto AttrsError;

		goto AttrsError;

	error = dpm_sysfs_add(dev);

	if (error)

		goto PMError;

	error = device_pm_add(dev);

	if (error) {

		dpm_sysfs_remove(dev);

		goto PMError;

	}

	error = bus_add_device(dev);

	error = bus_add_device(dev);

	if (error)

	if (error)

		goto BusError;

		goto BusError;

	error = device_pm_add(dev);

	if (error)

		goto PMError;

	kobject_uevent(&dev->kobj, KOBJ_ADD);

	kobject_uevent(&dev->kobj, KOBJ_ADD);

	bus_attach_device(dev);

	bus_attach_device(dev);

	if (parent)

	if (parent)
@@ -847,9 +842,9 @@ int device_add(struct device *dev) 
 Done:

 Done:

	put_device(dev);

	put_device(dev);

	return error;

	return error;

 BusError:

	device_pm_remove(dev);

 PMError:

 PMError:

	bus_remove_device(dev);

 BusError:

	if (dev->bus)

	if (dev->bus)

		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,

		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,

					     BUS_NOTIFY_DEL_DEVICE, dev);

					     BUS_NOTIFY_DEL_DEVICE, dev);

drivers/base/power/main.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -81,6 +81,8 @@ int device_pm_add(struct device *dev) 
		WARN_ON(true);

		WARN_ON(true);

		error = -EBUSY;

		error = -EBUSY;

	} else {

	} else {

		error = dpm_sysfs_add(dev);

		if (!error)

			list_add_tail(&dev->power.entry, &dpm_active);

			list_add_tail(&dev->power.entry, &dpm_active);

	}

	}

	mutex_unlock(&dpm_list_mtx);

	mutex_unlock(&dpm_list_mtx);