diff options
Diffstat (limited to 'drivers/pci/hotplug/acpi_pcihp.c')
| -rw-r--r-- | drivers/pci/hotplug/acpi_pcihp.c | 6 | 
1 files changed, 2 insertions, 4 deletions
| diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c index 45fcc1e96df..3bc72d18b12 100644 --- a/drivers/pci/hotplug/acpi_pcihp.c +++ b/drivers/pci/hotplug/acpi_pcihp.c @@ -338,9 +338,7 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags)  	acpi_handle chandle, handle;  	struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL }; -	flags &= (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL | -		  OSC_SHPC_NATIVE_HP_CONTROL | -		  OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL); +	flags &= OSC_SHPC_NATIVE_HP_CONTROL;  	if (!flags) {  		err("Invalid flags %u specified!\n", flags);  		return -EINVAL; @@ -360,7 +358,7 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags)  		acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);  		dbg("Trying to get hotplug control for %s\n",  				(char *)string.pointer); -		status = acpi_pci_osc_control_set(handle, flags); +		status = acpi_pci_osc_control_set(handle, &flags, flags);  		if (ACPI_SUCCESS(status))  			goto got_one;  		if (status == AE_SUPPORT) | 
