Merge branch 'acpica' into test
This commit is contained in:
@@ -536,13 +536,13 @@ static int acpi_processor_get_psd(struct acpi_processor *pr)
|
||||
|
||||
psd = buffer.pointer;
|
||||
if (!psd || (psd->type != ACPI_TYPE_PACKAGE)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
|
||||
printk(KERN_ERR PREFIX "Invalid _PSD data\n");
|
||||
result = -EFAULT;
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (psd->package.count != 1) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
|
||||
printk(KERN_ERR PREFIX "Invalid _PSD data\n");
|
||||
result = -EFAULT;
|
||||
goto end;
|
||||
}
|
||||
@@ -555,19 +555,19 @@ static int acpi_processor_get_psd(struct acpi_processor *pr)
|
||||
status = acpi_extract_package(&(psd->package.elements[0]),
|
||||
&format, &state);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
|
||||
printk(KERN_ERR PREFIX "Invalid _PSD data\n");
|
||||
result = -EFAULT;
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (pdomain->num_entries != ACPI_PSD_REV0_ENTRIES) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown _PSD:num_entries\n"));
|
||||
printk(KERN_ERR PREFIX "Unknown _PSD:num_entries\n");
|
||||
result = -EFAULT;
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (pdomain->revision != ACPI_PSD_REV0_REVISION) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown _PSD:revision\n"));
|
||||
printk(KERN_ERR PREFIX "Unknown _PSD:revision\n");
|
||||
result = -EFAULT;
|
||||
goto end;
|
||||
}
|
||||
|
Reference in New Issue
Block a user