Attachment 945224 Details for Bug 1150510 – Subject: [RHEL6.7 5/7] ACPI / memhotplug: free memory device if acpi_memory_enable_device() failed

[patch] Subject: [RHEL6.7 5/7] ACPI / memhotplug: free memory device if acpi_memory_enable_device() failed

0005-ACPI-memhotplug-free-memory-device-if-acpi_memory_en.patch (text/plain), 1.76 KB, created by Igor Mammedov on 2014-10-09 08:14:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Mammedov

Created: 2014-10-09 08:14:05 UTC

Size: 1.76 KB

patch

obsolete

>From b3b3d83b659073d18db1cd5a19d4698eae5bb602 Mon Sep 17 00:00:00 2001
>From: Igor Mammedov <imammedo@redhat.com>
>Date: Wed, 8 Oct 2014 12:57:27 +0000
>Subject: [RHEL6.7 5/7] ACPI / memhotplug: free memory device if
> acpi_memory_enable_device() failed
>
>Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1150510
>Upstream: e0b7b24dd9559fcda0f8bfd6acbcad81682c4fdd
>Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=8073569
>
>--
>    Author: Wen Congyang <wency@cn.fujitsu.com>  2012-11-16 01:08:16
>    ACPI / memhotplug: free memory device if acpi_memory_enable_device() failed
>
>    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>
>    Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
>    Acked-by: David Rientjes <rientjes@google.com>
>    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>--
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>---
> drivers/acpi/acpi_memhotplug.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
>index 21bc843..0576d91 100644
>--- a/drivers/acpi/acpi_memhotplug.c
>+++ b/drivers/acpi/acpi_memhotplug.c
>@@ -456,9 +456,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.8.3.1
>

Actions: View | Diff

Attachments on bug 1150510: 945218 | 945221 | 945222 | 945223 | 945224 | 945225 | 945226