Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7efd52a4 authored by Holger Macht's avatar Holger Macht Committed by Len Brown
Browse files

bay: exit if notify handler cannot be installed 



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.  This would result in an endless loop
consuming 100% of CPU.  So clean up and exit.

Signed-off-by: default avatarHolger Macht <hmacht@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 1fdd6860

drivers/acpi/bay.c

+10 −6
Original line number Diff line number Diff line
@@ -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