summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-07-19 00:03:50 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-19 00:03:50 +0200
commitbd798b7a88069b6ad273214ca3901d988104db71 (patch)
tree178e6dc336e5db6bc5ffae344d5891b0071354ff /drivers/base
parentb4269e2799993fce54f5003a3597e6fa8b621993 (diff)
parentad0446eb11b6886a73e077bd087f98544b8c0403 (diff)
downloadlinux-3.10-bd798b7a88069b6ad273214ca3901d988104db71.tar.gz
linux-3.10-bd798b7a88069b6ad273214ca3901d988104db71.tar.bz2
linux-3.10-bd798b7a88069b6ad273214ca3901d988104db71.zip
Merge branch 'pm-qos'
* pm-qos: PM / QoS: Use NULL pointer instead of plain integer in qos.c PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/qos.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index fd849a2c4fa..74a67e0019a 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -462,7 +462,7 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_add_ancestor_request);
static void __dev_pm_qos_drop_user_request(struct device *dev)
{
dev_pm_qos_remove_request(dev->power.pq_req);
- dev->power.pq_req = 0;
+ dev->power.pq_req = NULL;
}
/**