diff options
author | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
commit | 3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch) | |
tree | be2236bd4f6f16aee24cca5217449dc03a6c1e85 /drivers/misc/intel_menlow.c | |
parent | e911d27af43e7d28d59a96a4682e8942f0661469 (diff) | |
parent | 32836259ff25ce97010569706cd33ba94de81d62 (diff) |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/misc/intel_menlow.c')
-rw-r--r-- | drivers/misc/intel_menlow.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/misc/intel_menlow.c b/drivers/misc/intel_menlow.c index e00a2756e97..27b7662955b 100644 --- a/drivers/misc/intel_menlow.c +++ b/drivers/misc/intel_menlow.c @@ -52,6 +52,11 @@ MODULE_LICENSE("GPL"); #define MEMORY_ARG_CUR_BANDWIDTH 1 #define MEMORY_ARG_MAX_BANDWIDTH 0 +/* + * GTHS returning 'n' would mean that [0,n-1] states are supported + * In that case max_cstate would be n-1 + * GTHS returning '0' would mean that no bandwidth control states are supported + */ static int memory_get_int_max_bandwidth(struct thermal_cooling_device *cdev, unsigned long *max_state) { @@ -71,6 +76,9 @@ static int memory_get_int_max_bandwidth(struct thermal_cooling_device *cdev, if (ACPI_FAILURE(status)) return -EFAULT; + if (!value) + return -EINVAL; + *max_state = value - 1; return 0; } @@ -121,7 +129,7 @@ static int memory_set_cur_bandwidth(struct thermal_cooling_device *cdev, if (memory_get_int_max_bandwidth(cdev, &max_state)) return -EFAULT; - if (max_state < 0 || state > max_state) + if (state > max_state) return -EINVAL; arg_list.count = 1; |