diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 13:47:14 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 13:47:14 +0100 |
| commit | 6621c5a69a1dac50852ef09d5cf33154a174805a (patch) | |
| tree | 88f4ff7d73006abcef64f9793daadda9d5034a32 /drivers/acpi/container.c | |
| parent | d983f93328041f85e884a586810a67528ae59945 (diff) | |
| parent | d901188f002104905a7845298e1a7dc94189007a (diff) | |
Merge branch 'acpi-hotplug'
* acpi-hotplug:
ACPI / hotplug: Rework deferred execution of acpi_device_hotplug()
ACPI / dock: Update copyright notice
ACPI / dock: Drop remove_dock_dependent_devices()
ACPI / dock: Drop struct acpi_dock_ops and all code related to it
ACPI / ATA: Add hotplug contexts to ACPI companions of SATA devices
ACPI / dock: Add .uevent() callback to struct acpi_hotplug_context
ACPI / dock: Use callback pointers from devices' ACPI hotplug contexts
ACPI / dock: Use ACPI device object pointers instead of ACPI handles
ACPI / hotplug: Add .fixup() callback to struct acpi_hotplug_context
ACPI / hotplug / PCI: Do not clear event callback pointer for docks
ACPI / dock: Associate dock platform devices with ACPI device objects
ACPI / dock: Pass ACPI device pointer to acpi_device_is_battery()
ACPI / dock: Dispatch dock notifications from the global notify handler
Diffstat (limited to 'drivers/acpi/container.c')
| -rw-r--r-- | drivers/acpi/container.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 368f9ddb8480..a55cccbc7356 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c @@ -68,6 +68,9 @@ static int container_device_attach(struct acpi_device *adev, struct device *dev; int ret; + if (adev->flags.is_dock_station) + return 0; + cdev = kzalloc(sizeof(*cdev), GFP_KERNEL); if (!cdev) return -ENOMEM; |