From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 29 Nov 2012 20:40:32 +0000 (+0100)
Subject: Merge branch 'pm-qos'
X-Git-Tag: v3.8-rc1~182^2~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c8b6817103b23ed42114516fea901c2f61271506;p=~emulex%2Finfiniband.git

Merge branch 'pm-qos'

* pm-qos:
  PM / QoS: Handle device PM QoS flags while removing constraints
  PM / QoS: Resume device before exposing/hiding PM QoS flags
  PM / QoS: Document request manipulation requirement for flags
  PM / QoS: Fix a free error in the dev_pm_qos_constraints_destroy()
  PM / QoS: Fix the return value of dev_pm_qos_update_request()
  PM / ACPI: Take device PM QoS flags into account
  PM / Domains: Check device PM QoS flags in pm_genpd_poweroff()
  PM / QoS: Make it possible to expose PM QoS device flags to user space
  PM / QoS: Introduce PM QoS device flags support
  PM / QoS: Prepare struct dev_pm_qos_request for more request types
  PM / QoS: Introduce request and constraint data types for PM QoS flags
  PM / QoS: Prepare device structure for adding more constraint types
---

c8b6817103b23ed42114516fea901c2f61271506
diff --cc drivers/base/power/qos.c
index fbbd4ed2edf,f03f1ba28c7..ff46387f530
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@@ -449,9 -548,10 +548,10 @@@ int dev_pm_qos_add_ancestor_request(str
  		ancestor = ancestor->parent;
  
  	if (ancestor)
- 		error = dev_pm_qos_add_request(ancestor, req, value);
+ 		error = dev_pm_qos_add_request(ancestor, req,
+ 					       DEV_PM_QOS_LATENCY, value);
  
 -	if (error)
 +	if (error < 0)
  		req->dev = NULL;
  
  	return error;