From: Wen Congyang <wency@cn.fujitsu.com>
To: lenb@kernel.org, linux-acpi@vger.kernel.org,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Yasuaki ISIMATU <isimatu.yasuaki@jp.fujitsu.com>,
David Rientjes <rientjes@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH 2/7 v2] free memory device if acpi_memory_enable_device() failed
Date: Wed, 11 Jul 2012 15:47:50 +0800 [thread overview]
Message-ID: <4FFD2FA6.3060101@cn.fujitsu.com> (raw)
In-Reply-To: <4FFD2F1E.10006@cn.fujitsu.com>
If acpi_memory_enable_device() fails, acpi_memory_enable_device() will
return a non-zero value, which means we fail to bind the memory device
to this driver. So we should free memory device before acpi_memory_device_add()
returns.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
drivers/acpi/acpi_memhotplug.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index fe699ec..260a9c4 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -457,9 +457,11 @@ static int acpi_memory_device_add(struct acpi_device *device)
if (!acpi_memory_check_device(mem_device)) {
/* call add_memory func */
result = acpi_memory_enable_device(mem_device);
- if (result)
+ if (result) {
printk(KERN_ERR PREFIX
"Error in acpi_memory_enable_device\n");
+ acpi_memory_device_free(mem_device);
+ }
}
return result;
}
--
1.7.1
next prev parent reply other threads:[~2012-07-11 7:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-11 7:45 [PATCH 0/7 v2] some fixes about acpi_memhotplug Wen Congyang
2012-07-11 7:47 ` [PATCH 1/7 v2] fix memory leak when memory device is unbound from the module acpi_memhotplug Wen Congyang
2012-07-11 21:55 ` Andrew Morton
2012-07-11 7:47 ` Wen Congyang [this message]
2012-07-11 7:48 ` [PATCH 3/7 v2] remove memory info from list before freeing it Wen Congyang
2012-07-11 7:49 ` [PATCH 4/7 v2] don't allow to eject the memory device if it is being used Wen Congyang
2012-07-11 7:49 ` [PATCH 5/7 v2] bind the memory device when the driver is being loaded Wen Congyang
2012-07-11 7:50 ` [PATCH 6/7 v2] auto bind the memory device which is hotpluged before the driver is loaded Wen Congyang
2012-07-11 7:50 ` [PATCH 7/7 v2] release memory resources if hotadd_new_pgdat() failed Wen Congyang
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=4FFD2FA6.3060101@cn.fujitsu.com \
--to=wency@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=isimatu.yasuaki@jp.fujitsu.com \
--cc=konrad.wilk@oracle.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rientjes@google.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