A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'acpi-scan' into acpi-cleanup

Browse source 
The following commits depend on the 'acpi-scan' material.
This commit is contained in:
Rafael J. Wysocki 2013-01-29 13:58:34 +01:00
commit 64e94e7e0f
4 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/pci/hotplug/acpiphp_glue.c
View file

@ -742,8 +742,7 @@ static int acpiphp_bus_add(struct acpiphp_func *func)
/* this shouldn't be in here, so remove
* the bus then re-add it...
*/
ret_val = acpi_bus_trim(device);
dbg("acpi_bus_trim return %x\n", ret_val);
acpi_bus_trim(device);
}
ret_val = acpi_bus_scan(func->handle);
@ -772,11 +771,8 @@ static int acpiphp_bus_trim(acpi_handle handle)
return retval;
}
retval = acpi_bus_trim(device);
if (retval)
err("cannot remove from acpi list\n");
return retval;
acpi_bus_trim(device);
return 0;
}
static void acpiphp_set_acpi_region(struct acpiphp_slot *slot)