mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branches 'acpi-dock', 'acpi-scan' and 'acpi-pci-hotplug'
* acpi-dock: ACPI / dock: Use acpi_device_enumerated() to check if dock is present * acpi-scan: ACPI / container: Fix error code path in container_device_attach() * acpi-pci-hotplug: ACPI / hotplug / PCI: Relax the checking of _STA return values
This commit is contained in:
commit
d990ce0d5b
2 changed files with 16 additions and 4 deletions
|
|
@ -79,9 +79,10 @@ static int container_device_attach(struct acpi_device *adev,
|
|||
ACPI_COMPANION_SET(dev, adev);
|
||||
dev->release = acpi_container_release;
|
||||
ret = device_register(dev);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
put_device(dev);
|
||||
return ret;
|
||||
|
||||
}
|
||||
adev->driver_data = dev;
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue