lkml.org 
[lkml]   [2008]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] use pr->cdev as a condition for cleanup
    Date
    The acpi_processor_start() function can fail before creating the
    sysfs nodes for thermal cooling. In this case, pr->cdev will be NULL,
    and the removal code will break.

    This patch uses pr->cdev as a criteria for termination of the
    mentioned code, and avoids it, if it was never initialized.

    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    ---
    drivers/acpi/processor_core.c | 10 ++++++----
    1 files changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
    index 9480203..5023410 100644
    --- a/drivers/acpi/processor_core.c
    +++ b/drivers/acpi/processor_core.c
    @@ -811,10 +811,12 @@ static int acpi_processor_remove(struct

    acpi_processor_remove_fs(device);

    - sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
    - sysfs_remove_link(&pr->cdev->device.kobj, "device");
    - thermal_cooling_device_unregister(pr->cdev);
    - pr->cdev = NULL;
    + if (pr->cdev) {
    + sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
    + sysfs_remove_link(&pr->cdev->device.kobj, "device");
    + thermal_cooling_device_unregister(pr->cdev);
    + pr->cdev = NULL;
    + }

    processors[pr->id] = NULL;

    --
    1.4.2


    \
     
     \ /
      Last update: 2008-02-18 22:07    [W:0.047 / U:30.032 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site