From patchwork Tue Aug 17 00:56:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jin Dongming X-Patchwork-Id: 119833 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7H0uvS1003596 for ; Tue, 17 Aug 2010 00:56:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756959Ab0HQA4d (ORCPT ); Mon, 16 Aug 2010 20:56:33 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:55155 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756943Ab0HQA4c (ORCPT ); Mon, 16 Aug 2010 20:56:32 -0400 Received: from m1.gw.fujitsu.co.jp ([10.0.50.71]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o7H0uU9E008756 (envelope-from jin.dongming@np.css.fujitsu.com); Tue, 17 Aug 2010 09:56:31 +0900 Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 9B08245DE50; Tue, 17 Aug 2010 09:56:30 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 6B81E45DE4F; Tue, 17 Aug 2010 09:56:30 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 236191DB8050; Tue, 17 Aug 2010 09:56:30 +0900 (JST) Received: from m003.s.css.fujitsu.com (m003.s.css.fujitsu.com [10.23.4.33]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id BA96F1DB804F; Tue, 17 Aug 2010 09:56:29 +0900 (JST) Received: from m003.css.fujitsu.com (m003 [127.0.0.1]) by m003.s.css.fujitsu.com (Postfix) with ESMTP id 89A952E00EF; Tue, 17 Aug 2010 09:56:29 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.102.46]) by m003.s.css.fujitsu.com (Postfix) with ESMTP id 56ED02E011B; Tue, 17 Aug 2010 09:56:29 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v1.5.1 Message-ID: <4C69DE57.9070608@np.css.fujitsu.com> Date: Tue, 17 Aug 2010 09:56:55 +0900 From: Jin Dongming User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; ja; rv:1.9.2.7) Gecko/20100713 Thunderbird/3.1.1 MIME-Version: 1.0 To: Huang Ying CC: Randy Dunlap , Stephen Rothwell , Andi Kleen , Hidetoshi Seto , ACPI , LKLM Subject: [PATCH 3/4] [Patch-next] ACPI, APEI Fix the return value(==NULL) of acpi_pre_map always. Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 17 Aug 2010 00:56:57 +0000 (UTC) diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c index 8f8bd73..1bc2614 100644 --- a/drivers/acpi/atomicio.c +++ b/drivers/acpi/atomicio.c @@ -133,7 +133,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr, spin_lock_irqsave(&acpi_iomaps_lock, flags); vaddr = __acpi_try_ioremap(paddr, size); - if (vaddr) { + if (unlikely(vaddr)) { spin_unlock_irqrestore(&acpi_iomaps_lock, flags); iounmap(map->vaddr); kfree(map); @@ -142,7 +142,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr, list_add_tail_rcu(&map->list, &acpi_iomaps); spin_unlock_irqrestore(&acpi_iomaps_lock, flags); - return vaddr + (paddr - pg_off); + return map->vaddr + (paddr - pg_off); err_unmap: iounmap(vaddr); return NULL;