From: Glauber Costa <gcosta@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, andrew.grover@intel.com,
paul.s.diefenbaugh@intel.com, linux@brodo.de,
anil.s.keshavamurthy@intel.com, lenb@kernel.org,
linux-acpi@vger.kernel.org, Glauber Costa <gcosta@redhat.com>
Subject: [PATCH 2/4] use pr->cdev as a condition for cleanup
Date: Mon, 18 Feb 2008 17:56:51 -0300 [thread overview]
Message-ID: <1203368213-30528-2-git-send-email-gcosta@redhat.com> (raw)
In-Reply-To: <1203368213-30528-1-git-send-email-gcosta@redhat.com>
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
next prev parent reply other threads:[~2008-02-18 21:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-18 20:56 [PATCH 1/4] make cdev attribuition the last step Glauber Costa
2008-02-18 20:56 ` Glauber Costa [this message]
2008-02-18 20:56 ` [PATCH 3/4] provide error handling for unclean objects Glauber Costa
2008-02-18 20:56 ` [PATCH 4/4] remove goto statement Glauber Costa
2008-02-19 1:19 ` Li Zefan
2008-02-19 2:07 ` Glauber Costa
2008-02-19 2:22 ` Li Zefan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1203368213-30528-2-git-send-email-gcosta@redhat.com \
--to=gcosta@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=andrew.grover@intel.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@brodo.de \
--cc=paul.s.diefenbaugh@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox