diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-30 10:16:50 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-30 10:16:50 +1000 |
| commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
| tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /drivers/acpi/bay.c | |
| parent | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (diff) | |
| parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) | |
| download | linux-e9a4b6a3f6592862a67837e80aad3f50468857a6.tar.gz linux-e9a4b6a3f6592862a67837e80aad3f50468857a6.tar.bz2 linux-e9a4b6a3f6592862a67837e80aad3f50468857a6.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/acpi/bay.c')
| -rw-r--r-- | drivers/acpi/bay.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index d2fc94161848..61b6c5beb2d3 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c @@ -301,16 +301,20 @@ static int bay_add(acpi_handle handle, int id) */ pdev->dev.uevent_suppress = 0; - if (acpi_bay_add_fs(new_bay)) { - platform_device_unregister(new_bay->pdev); - goto bay_add_err; - } - /* register for events on this device */ status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, bay_notify, new_bay); if (ACPI_FAILURE(status)) { - printk(KERN_ERR PREFIX "Error installing bay notify handler\n"); + printk(KERN_INFO PREFIX "Error installing bay notify handler\n"); + platform_device_unregister(new_bay->pdev); + goto bay_add_err; + } + + if (acpi_bay_add_fs(new_bay)) { + acpi_remove_notify_handler(handle, ACPI_SYSTEM_NOTIFY, + bay_notify); + platform_device_unregister(new_bay->pdev); + goto bay_add_err; } /* if we are on a dock station, we should register for dock @@ -373,6 +377,9 @@ static int __init bay_init(void) INIT_LIST_HEAD(&drive_bays); + if (acpi_disabled) + return -ENODEV; + /* look for dockable drive bays */ acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, find_bay, &bays, NULL); |