lkml.org 
[lkml]   [2008]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 19/33] bay: exit if notify handler cannot be installed
    2.6.25-stable review patch.  If anyone has any objections, please let us
    know.

    ------------------

    From: Holger Macht <hmacht@suse.de>

    commit 7efd52a407bed6a2b02015b8ebbff7beba155392 upstream

    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: Holger Macht <hmacht@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/acpi/bay.c | 16 ++++++++++------
    1 file changed, 10 insertions(+), 6 deletions(-)

    --- a/drivers/acpi/bay.c
    +++ b/drivers/acpi/bay.c
    @@ -299,16 +299,20 @@ static int bay_add(acpi_handle handle, i
    */
    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
    --


    \
     
     \ /
      Last update: 2008-08-04 22:31    [W:0.036 / U:30.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site