aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-09-17 14:25:51 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-09-17 14:25:51 -0400
commit87a2337abdd752d711724d7654a6db1b5b4c0d4d (patch)
treebd59e6a86d5b623f065ab162a465af7ceed7466d /kernel
parentcf899680feb87af09ea18eea87aa03ea56afd9ba (diff)
parentc6a57bfffea5b673e5b4f9aeff85a00607e59077 (diff)
Merge branch 'pm-qos'
* pm-qos: PM / QoS: Add return code to pm_qos_get_value function.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/qos.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/qos.c b/kernel/power/qos.c
index 6a031e684026..846bd42c7ed1 100644
--- a/kernel/power/qos.c
+++ b/kernel/power/qos.c
@@ -139,6 +139,7 @@ static inline int pm_qos_get_value(struct pm_qos_constraints *c)
139 default: 139 default:
140 /* runtime check for not using enum */ 140 /* runtime check for not using enum */
141 BUG(); 141 BUG();
142 return PM_QOS_DEFAULT_VALUE;
142 } 143 }
143} 144}
144 145