From patchwork Thu Apr 11 14:38:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 235759 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wi0-x23f.google.com (mail-wi0-x23f.google.com [IPv6:2a00:1450:400c:c05::23f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 5D80E2C0089 for ; Fri, 12 Apr 2013 00:40:19 +1000 (EST) Received: by mail-wi0-f191.google.com with SMTP id hn17sf166739wib.18 for ; Thu, 11 Apr 2013 07:40:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:from:to:cc:subject:date:message-id:x-mailer :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-google-group-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe :content-type; bh=I3v+z79hL3NhzZn2BPCr6X7YGk/0Oj9uBvU4sDnNxI4=; b=Y4vfQ1DqNTFdf6COIn7gKT43cK83TmRK69tqrGDcmzvDIRbjRgCzTW7h0QCv88RDQI Bi41JcPo7XmyobKKrvsnK5j0qHjkti/KXKiSvfjIoqs0d+y74q9r8cWSmIQgVlqMTUFE O9Qgp/xnrafUY6Bo4n5gYESynwTkVuh4qxmbnwB1WvmiLBmohBmeP3vlJ6xWdlGCGRRE ldzVdm4qnNjT26JFnJjhDnK7zbgX74C9+k1hpqsbzWWGmdOFYjB3JeEuxtn4PBfnFoaQ 4oYD50smpr/Yl9J5RoPxts2qegT71EOAKHC3SEvW3DqA6frJ9a60juQodunCAtE7SYir L1bA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:from:to:cc:subject:date:message-id:x-mailer :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-google-group-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe :content-type; bh=I3v+z79hL3NhzZn2BPCr6X7YGk/0Oj9uBvU4sDnNxI4=; b=nTqsVjdMr96eTGNCISviE0/wm80vVjIxejzEw/6vPYhesNmXADvEUxLCg/oTx/okuJ dkPUqNVJy/Z4HP1uhnbj+ngTcjgjtn1nfDYWiK7VIeOLhaXV70b0DAcK+g5VeE7sTLZ5 xYLu3LYBFvksmS0CB9ffcHTn+3JFM7kHb9CXfhHKtCYVE8QiJJ+LvDr+fkuxqAZcMumY KbyPS9uYufqR0yjkAIx7jDilGjN25HOOYBswalg6ixOdiR4rFk9pK4wzGVgh4bZiABn9 KeA4WvGrAeP4knNouVWR+2loJY4TPuYjgXstfEOZsqaZbjX2X6seDVeB7nJ9xmbYRuQi UeQw== X-Received: by 10.180.189.51 with SMTP id gf19mr757141wic.10.1365691215341; Thu, 11 Apr 2013 07:40:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.180.211.169 with SMTP id nd9ls220763wic.1.canary; Thu, 11 Apr 2013 07:40:14 -0700 (PDT) X-Received: by 10.204.228.132 with SMTP id je4mr442833bkb.6.1365691214693; Thu, 11 Apr 2013 07:40:14 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com [209.85.217.181]) by gmr-mx.google.com with ESMTPS id i9si380894bki.2.2013.04.11.07.40.14 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Apr 2013 07:40:14 -0700 (PDT) Received-SPF: pass (google.com: domain of jhovold@gmail.com designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by mail-lb0-f181.google.com with SMTP id r11so1677873lbv.12 for ; Thu, 11 Apr 2013 07:40:14 -0700 (PDT) X-Received: by 10.152.29.102 with SMTP id j6mr3364323lah.47.1365691214364; Thu, 11 Apr 2013 07:40:14 -0700 (PDT) Received: from omicron.terra (c83-179-13-247.cust.tele2.se. [83.179.13.247]) by mx.google.com with ESMTPS id b2sm1849576lbv.4.2013.04.11.07.40.12 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 11 Apr 2013 07:40:13 -0700 (PDT) Received: from johan by omicron.terra with local (Exim 4.80.1) (envelope-from ) id 1UQIeg-0002KM-JM; Thu, 11 Apr 2013 16:39:14 +0200 From: Johan Hovold To: Alessandro Zummo , Nicolas Ferre Cc: rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org, Johan Hovold , stable Subject: [rtc-linux] [PATCH] rtc: rtc-at91rm9200: fix missing iounmap Date: Thu, 11 Apr 2013 16:38:36 +0200 Message-Id: <1365691116-8882-1-git-send-email-jhovold@gmail.com> X-Mailer: git-send-email 1.8.1.5 X-Original-Sender: jhovold@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jhovold@gmail.com designates 209.85.217.181 as permitted sender) smtp.mail=jhovold@gmail.com; dkim=pass header.i=@gmail.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Add missing iounmap to probe error path and remove. Cc: stable Signed-off-by: Johan Hovold Acked-by: Nicolas Ferre --- drivers/rtc/rtc-at91rm9200.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c index 434ebc3..eebd8ac 100644 --- a/drivers/rtc/rtc-at91rm9200.c +++ b/drivers/rtc/rtc-at91rm9200.c @@ -297,7 +297,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev) "at91_rtc", pdev); if (ret) { dev_err(&pdev->dev, "IRQ %d already in use.\n", irq); - return ret; + goto err_unmap; } /* cpu init code should really have flagged this device as @@ -309,13 +309,20 @@ static int __init at91_rtc_probe(struct platform_device *pdev) rtc = rtc_device_register(pdev->name, &pdev->dev, &at91_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) { - free_irq(irq, pdev); - return PTR_ERR(rtc); + ret = PTR_ERR(rtc); + goto err_free_irq; } platform_set_drvdata(pdev, rtc); dev_info(&pdev->dev, "AT91 Real Time Clock driver.\n"); return 0; + +err_free_irq: + free_irq(irq, pdev); +err_unmap: + iounmap(at91_rtc_regs); + + return ret; } /* @@ -332,6 +339,7 @@ static int __exit at91_rtc_remove(struct platform_device *pdev) free_irq(irq, pdev); rtc_device_unregister(rtc); + iounmap(at91_rtc_regs); platform_set_drvdata(pdev, NULL); return 0;