aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-12-14 14:54:09 -0500
committerLen Brown <len.brown@intel.com>2007-12-14 14:54:09 -0500
commit5889ba0a6a1174ac38d7045824a2d2ed8e93d756 (patch)
tree208cc0412edc998267a6dd375b1ba7ac24000f19 /drivers/acpi
parentd020c36685a35f66be89700e911c7d77a67bdc43 (diff)
parent6ce7641b879e4b9ead46e14275d9d3645b47fa63 (diff)
Pull hotplug into release branch
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/pci_bind.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 028969370bbf..388300de005d 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -294,9 +294,6 @@ int acpi_pci_unbind(struct acpi_device *device)
294 acpi_get_data(device->handle, acpi_pci_data_handler, 294 acpi_get_data(device->handle, acpi_pci_data_handler,
295 (void **)&data); 295 (void **)&data);
296 if (ACPI_FAILURE(status)) { 296 if (ACPI_FAILURE(status)) {
297 ACPI_EXCEPTION((AE_INFO, status,
298 "Unable to get data from device %s",
299 acpi_device_bid(device)));
300 result = -ENODEV; 297 result = -ENODEV;
301 goto end; 298 goto end;
302 } 299 }