From patchwork Tue Jun 27 09:26:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 106410 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp996432qge; Tue, 27 Jun 2017 02:29:11 -0700 (PDT) X-Received: by 10.84.224.133 with SMTP id s5mr4682816plj.93.1498555751696; Tue, 27 Jun 2017 02:29:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498555751; cv=none; d=google.com; s=arc-20160816; b=hXsQLheijGkOfvyQwMrO8dN9LytZTX1qeibvLeZmBKlizlMaBx7tErB3HDL1XkHzGj 0rPxrswNpwQ6Nxa9omDyJCfw1IlLgrL80UCeZ7Tst6T/5mb9MPuHHvoSHBl7EjpWOe/+ qooVBgqjvFkyBWUKAuTSvPRW2hotiR3h7CJeQGBuEFW6OdvJxFv4powBOE7Ww/Ta40EE EXy8lm1uktcL2VmWayvbcr2mIg4N3EJbz+l2viH8pZy274WRd6BjAmmbwWZfWrtzUmnP nuVj/4wxAMPsyGkTcJHzGE4rH7fAqFbmJ8w46qjQq6R5JmHALcfLdXdt7S9K8DD/aI3l 2Ljg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=L2CkwzNMsfr5/Gr6FnB4UNp9MBeBrA+xvmfwvMxCa04=; b=lOKtmtgIJ48507yVuVTcE1DMKfUAGf3ra4VumPJ4uhc6BOQTciII0PKiZnpyMbrWRj BIvzJ3zve/+doPnqQBZ2NWKUyJwMjxG/mjdVVi3Joq/mkmsUJvLvq/LQivT0Y2nzG2UO yZLwdtZ1HgxgTjxB2y6w5/TeZPSLDL9WrxJ7RfnRqz2ngj8tTap5kMMKYwiuYN0ablIl E6qrvhGxfUbVTVprMFRQIVoXndtOFNYb/Awz9YhhPH6K0wV2+8zdaI4YLLLqIh0HCoch wDDWkShrMiSRSGzjHoOSYXuhDU8ZB8VYgnj+nOqzPnpMSBzqdA0UisDGMRUe3dnCDOUm XfYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=CjrZHge9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s80si1603828pfs.171.2017.06.27.02.29.11; Tue, 27 Jun 2017 02:29:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=CjrZHge9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752640AbdF0J3A (ORCPT + 25 others); Tue, 27 Jun 2017 05:29:00 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:36640 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752340AbdF0J2b (ORCPT ); Tue, 27 Jun 2017 05:28:31 -0400 Received: by mail-wm0-f41.google.com with SMTP id 62so19023254wmw.1 for ; Tue, 27 Jun 2017 02:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L2CkwzNMsfr5/Gr6FnB4UNp9MBeBrA+xvmfwvMxCa04=; b=CjrZHge9+MiOWRwoHx1+9yAmhXWlMX1bHvlXtefbZbxyYIY4xSeCKUXtjrdPDVqFD0 ihNTLpgfNY84yUamwM29hOAQKrUSVBgWVbB1/3jYYTDr16eI5AfSLnzJo/Hb0ZKPuUwg D1QXipiJh9XB5lhJYesStwGiN5a7zF8OckWSM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L2CkwzNMsfr5/Gr6FnB4UNp9MBeBrA+xvmfwvMxCa04=; b=TC/brAZTNPZwJsC8JaTIYboOZMbnHUgS03XLxaikwJWCLnUBphVqUGAsERNYGAX2LX CIbMTjaLLwToCZQnHxZPLO/ZLf8ZGvkney4GvBK3O1sNunRzIFUNewI6XlaNml4JvH7m iUt4YtbAb1zdqzltKqIiGOo+BIfNhx1F/mHh1DkZzsUMfGRQfTdzhET8UfYBE8XEtGB5 y40VMFkfwsCmIuRUBsW0QbOtcowLZmKZl+Xa90/bEvp9hNwlT4SDYJLb1f/6khhWyG56 kC6F7I+z5LgcDvNOAk4GS4IBQoBTMMWHQbALntJjlPu5cdUa7j7AFdUHNyyX0vUSIq4r oJrA== X-Gm-Message-State: AKS2vOwW7yV+JTSAO5bA9VPZT1eIL4dDhNBnlPwX2W5o0kNe1wvYJ9bS 6VHmuNXDtSMWmN0kGFjXXQ== X-Received: by 10.28.180.66 with SMTP id d63mr2687172wmf.78.1498555710205; Tue, 27 Jun 2017 02:28:30 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:110f:661:6b72:192e]) by smtp.gmail.com with ESMTPSA id g2sm16159798wrg.69.2017.06.27.02.28.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Jun 2017 02:28:29 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Arvind Yadav Subject: [PATCH 4/5] clocksource/drivers/fsl_ftm_timer: Unmap region obtained by of_iomap Date: Tue, 27 Jun 2017 11:26:59 +0200 Message-Id: <1498555620-25094-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498555620-25094-1-git-send-email-daniel.lezcano@linaro.org> References: <20170627092239.GE2479@mai> <1498555620-25094-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arvind Yadav In case of error at init time, rollback iomapping. Signed-off-by: Arvind Yadav Signed-off-by: Daniel Lezcano --- drivers/clocksource/fsl_ftm_timer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c index 3121e2d..3ee7e6f 100644 --- a/drivers/clocksource/fsl_ftm_timer.c +++ b/drivers/clocksource/fsl_ftm_timer.c @@ -329,13 +329,13 @@ static int __init ftm_timer_init(struct device_node *np) priv->clkevt_base = of_iomap(np, 0); if (!priv->clkevt_base) { pr_err("ftm: unable to map event timer registers\n"); - goto err; + goto err_clkevt; } priv->clksrc_base = of_iomap(np, 1); if (!priv->clksrc_base) { pr_err("ftm: unable to map source timer registers\n"); - goto err; + goto err_clksrc; } ret = -EINVAL; @@ -366,6 +366,10 @@ static int __init ftm_timer_init(struct device_node *np) return 0; err: + iounmap(priv->clksrc_base); +err_clksrc: + iounmap(priv->clkevt_base); +err_clkevt: kfree(priv); return ret; }