If acpi_install_notify_handler() for a bay device fails, the bay driver is superfluous. Most likely, another driver (like libata) is already caring about this device anyway. Furthermore, register_hotplug_dock_device(acpi_handle) from the dock driver must not be called twice with the same handler. So clean up and exit. Signed-off-by: Holger Macht <hmacht@xxxxxxx> --- diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index d2fc941..ce9038f 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c @@ -311,6 +311,7 @@ static int bay_add(acpi_handle handle, int id) bay_notify, new_bay); if (ACPI_FAILURE(status)) { printk(KERN_ERR PREFIX "Error installing bay notify handler\n"); + goto bay_add_err; } /* if we are on a dock station, we should register for dock -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html