summaryrefslogtreecommitdiffstats
path: root/include
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 /include
parentb4269e2799993fce54f5003a3597e6fa8b621993 (diff)
parentad0446eb11b6886a73e077bd087f98544b8c0403 (diff)
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 'include')
-rw-r--r--include/linux/pm_qos.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
index 233149cb19f..9924ea1f22e 100644
--- a/include/linux/pm_qos.h
+++ b/include/linux/pm_qos.h
@@ -66,7 +66,7 @@ enum pm_qos_req_action {
static inline int dev_pm_qos_request_active(struct dev_pm_qos_request *req)
{
- return req->dev != 0;
+ return req->dev != NULL;
}
int pm_qos_update_target(struct pm_qos_constraints *c, struct plist_node *node,