Merge branch 'pm-qos'

* pm-qos:
  PM / QoS: Add return code to pm_qos_get_value function.

kernel/power/qos.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,7 @@ static inline int pm_qos_get_value(struct pm_qos_constraints *c)
		default:
		/* runtime check for not using enum */
		BUG();
		return PM_QOS_DEFAULT_VALUE;
		}
		}