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

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

Merge tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management update from Rafael Wysocki:
 "Fix for an incorrect error condition check in device PM QoS code that
  may lead to an Oops from Guennadi Liakhovetski."

* tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / QoS: fix wrong error-checking condition
parents 1d838d70 a7227a0f

drivers/base/power/qos.c

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ int dev_pm_qos_add_ancestor_request(struct device *dev, 
	if (ancestor)

		error = dev_pm_qos_add_request(ancestor, req, value);



	if (error)

	if (error < 0)

		req->dev = NULL;



	return error;