From patchwork Wed Jul 11 07:47:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 1180761 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 8164CDF25A for ; Wed, 11 Jul 2012 07:43:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756696Ab2GKHnR (ORCPT ); Wed, 11 Jul 2012 03:43:17 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:26996 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756719Ab2GKHnQ (ORCPT ); Wed, 11 Jul 2012 03:43:16 -0400 X-IronPort-AV: E=Sophos;i="4.77,566,1336320000"; d="scan'208";a="5371807" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 11 Jul 2012 15:42:23 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q6B7hCY0020850; Wed, 11 Jul 2012 15:43:13 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012071115430604-643492 ; Wed, 11 Jul 2012 15:43:06 +0800 Message-ID: <4FFD2FA6.3060101@cn.fujitsu.com> Date: Wed, 11 Jul 2012 15:47:50 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: lenb@kernel.org, linux-acpi@vger.kernel.org, "linux-kernel@vger.kernel.org" CC: Yasuaki ISIMATU , David Rientjes , Andrew Morton , Konrad Rzeszutek Wilk Subject: [PATCH 2/7 v2] free memory device if acpi_memory_enable_device() failed References: <4FFD2F1E.10006@cn.fujitsu.com> In-Reply-To: <4FFD2F1E.10006@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/07/11 15:43:06, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/07/11 15:43:07, Serialize complete at 2012/07/11 15:43:07 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 --- 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; }