From patchwork Mon May 6 13:11:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Libo Chen X-Patchwork-Id: 241642 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43A5A2C00EE for ; Mon, 6 May 2013 23:11:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753245Ab3EFNLd (ORCPT ); Mon, 6 May 2013 09:11:33 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:17595 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753174Ab3EFNLc (ORCPT ); Mon, 6 May 2013 09:11:32 -0400 Received: from 172.24.2.119 (EHLO szxeml210-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id BBD53790; Mon, 06 May 2013 21:11:30 +0800 (CST) Received: from SZXEML408-HUB.china.huawei.com (10.82.67.95) by szxeml210-edg.china.huawei.com (172.24.2.183) with Microsoft SMTP Server (TLS) id 14.1.323.7; Mon, 6 May 2013 21:11:29 +0800 Received: from [127.0.0.1] (10.135.72.158) by szxeml408-hub.china.huawei.com (10.82.67.95) with Microsoft SMTP Server id 14.1.323.7; Mon, 6 May 2013 21:11:22 +0800 Message-ID: <5187ABF9.4000903@huawei.com> Date: Mon, 6 May 2013 21:11:21 +0800 From: Libo Chen User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130328 Thunderbird/17.0.5 MIME-Version: 1.0 To: CC: , , , Li Zefan Subject: [PATCH 2/2] i2c: pxa: no need release_mem_region before request_mem_region successful X-Originating-IP: [10.135.72.158] X-CFilter-Loop: Reflected Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org move release_mem_region above kfree(i2c) && below clk_put(i2c->clk) Signed-off-by: Libo Chen --- drivers/i2c/busses/i2c-pxa.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index ea6d45d..3188cd0 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1129,7 +1129,7 @@ static int i2c_pxa_probe(struct platform_device *dev) i2c->clk = clk_get(&dev->dev, NULL); if (IS_ERR(i2c->clk)) { ret = PTR_ERR(i2c->clk); - goto eclk; + goto emm; } i2c->reg_base = ioremap(res->start, resource_size(res)); @@ -1206,10 +1206,11 @@ ereqirq: iounmap(i2c->reg_base); eremap: clk_put(i2c->clk); +emm: + release_mem_region(res->start, resource_size(res)); eclk: kfree(i2c); emalloc: - release_mem_region(res->start, resource_size(res)); return ret; }