diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-12-23 03:21:47 +0300 | 
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-23 03:21:47 +0300 | 
| commit | f80ca163d65903276bec7045a484a79c0897eb2d (patch) | |
| tree | 97c7d61d43248b9db0757a76af80ff58b98b5599 /drivers/acpi/processor_throttling.c | |
| parent | 0794ec8ce327ec74416b569b8fb1951274693700 (diff) | |
| parent | a6d52d70677e99bdb89b6921c265d0a58c22e597 (diff) | |
| download | linux-f80ca163d65903276bec7045a484a79c0897eb2d.tar.xz | |
Merge branch 'ioat' into fixes
Diffstat (limited to 'drivers/acpi/processor_throttling.c')
| -rw-r--r-- | drivers/acpi/processor_throttling.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index 4c6c14c1e307..1c5d7a8b2fdf 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.  | 
