summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/processor_throttling.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-12-01 09:01:54 -0800
committerEric Anholt <eric@anholt.net>2009-12-01 09:01:54 -0800
commitf40d6817a5c2bf84f5fe7b5d1a83f1e8f8669951 (patch)
tree1c515a34a60f65cbfd3cf1a387427d0a9fdf878f /drivers/acpi/processor_throttling.c
parent103a196f4224dc6872081305cf7f82ebf67aa7bd (diff)
parent46557bef3f3834ac33031c7be27d39d90d507442 (diff)
Merge remote branch 'airlied/drm-next' into drm-intel-next
Diffstat (limited to 'drivers/acpi/processor_throttling.c')
-rw-r--r--drivers/acpi/processor_throttling.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 4c6c14c1e30..1c5d7a8b2fd 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -1133,15 +1133,15 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
int result = 0;
struct acpi_processor_throttling *pthrottling;
+ if (!pr)
+ return -EINVAL;
+
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"pblk_address[0x%08x] duty_offset[%d] duty_width[%d]\n",
pr->throttling.address,
pr->throttling.duty_offset,
pr->throttling.duty_width));
- if (!pr)
- return -EINVAL;
-
/*
* Evaluate _PTC, _TSS and _TPC
* They must all be present or none of them can be used.