From patchwork Wed Feb 18 21:10:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 441154 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 5525E14007D for ; Thu, 19 Feb 2015 08:13:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AAA5B4B64D; Wed, 18 Feb 2015 22:13:37 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id killsS9f4Ay4; Wed, 18 Feb 2015 22:13:37 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 63FCF4A056; Wed, 18 Feb 2015 22:13:24 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1D9824A04F for ; Wed, 18 Feb 2015 22:13:16 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9EK3DdEYwwAl for ; Wed, 18 Feb 2015 22:13:16 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ob0-f202.google.com (mail-ob0-f202.google.com [209.85.214.202]) by theia.denx.de (Postfix) with ESMTPS id B1D5F4A04A for ; Wed, 18 Feb 2015 22:13:13 +0100 (CET) Received: by mail-ob0-f202.google.com with SMTP id nt9so1395802obb.1 for ; Wed, 18 Feb 2015 13:13:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YuZ6898v4cvDZnawH/pBgnXc89xS+5TI2pQ6kX7/mmQ=; b=bmyFpI24IrPJSBSHg/X6Cb5VEmsjUO8vsDzuti9UZ2jRXVsqPDQow5T2bEZG3A0SL8 YNET6sPnK5j94UqHeHWnK/shubsYPfJr2tnepaBUYnu9v+RZfo7vlBaiwF6h2YYula4R 3K9y7rqkZb/R+OWZi2cdI3PQLemRQyM5p2qxek06hR0GjrqjObUd8BP0y+ZuPeRoUQgd 8zR9qFtuivdEN+lxkqiryJTrwZ9PFH/ZE4kTkz6BschTAnRQ3JmdxZFw3Si6EQDm5cAc wMD9JnsG80ftWtoaQSkmmOpA4soWD+7yu+SklaFLVXmvn/71jNQety9lmNjKAx5YeJrS K7Kw== X-Gm-Message-State: ALoCoQmk2/eChpVh9z6DViXnnlK34wOYvrBCMu3Vdd8kmTecnyaTdQc44vT6/tdcrX0m10Qetz7x X-Received: by 10.182.107.202 with SMTP id he10mr1323519obb.19.1424293992540; Wed, 18 Feb 2015 13:13:12 -0800 (PST) Received: from corpmail-nozzle1-2.hot.corp.google.com ([100.108.1.103]) by gmr-mx.google.com with ESMTPS id ba9si4490693qcb.0.2015.02.18.13.13.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Feb 2015 13:13:12 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-2.hot.corp.google.com with ESMTP id mmUQZYvg.1; Wed, 18 Feb 2015 13:13:12 -0800 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 59A4F22186E; Wed, 18 Feb 2015 14:13:11 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Wed, 18 Feb 2015 14:10:33 -0700 Message-Id: <1424293849-22193-7-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1424293849-22193-1-git-send-email-sjg@chromium.org> References: <1424293849-22193-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH 06/22] Correct map_sysmem() logic in do_mem_mw() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This function does not unmap what it maps. Correct it. Signed-off-by: Simon Glass --- common/cmd_mem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/cmd_mem.c b/common/cmd_mem.c index bcb3ee3..855aa57 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -165,7 +165,7 @@ static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif ulong addr, count; int size; - void *buf; + void *buf, *start; ulong bytes; if ((argc < 3) || (argc > 4)) @@ -197,7 +197,8 @@ static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } bytes = size * count; - buf = map_sysmem(addr, bytes); + start = map_sysmem(addr, bytes); + buf = start; while (count-- > 0) { if (size == 4) *((u32 *)buf) = (u32)writeval; @@ -211,7 +212,7 @@ static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) *((u8 *)buf) = (u8)writeval; buf += size; } - unmap_sysmem(buf); + unmap_sysmem(start); return 0; }