From patchwork Tue Nov 12 03:47:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yue Haibing X-Patchwork-Id: 11238515 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D0E50139A for ; Tue, 12 Nov 2019 03:49:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A24AE2084E for ; Tue, 12 Nov 2019 03:49:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="k94DZxku" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A24AE2084E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A700IfNalHWyeSR/FYLBQg492LYwL6zcoZSLyvjq9zc=; b=k94DZxku9Zr0zQ ES8Xvs5qA/tVsViZsQ8Re4XZgd0li6qWPQeXzMOgcRuueJU/sPQbyGnZcHHQnHUW2IRXmsZLgYlbp XCYItImJ1J9nDz4ZjEtXjuHgl9lRBM26Hks7ieAelmN6fkftDPGsg3/RlCnRgwwqd4pngPAfusXsS yP5tFyqZX40jWLK1OP4+d49zDQj4TN+qb3v0uPaRyuDgmDYF0P/uhbjHt4KcopINXGxHo9W4ioA2+ 2aRx94V2fu5TJBkk4lt5rKjwO52HgCZSmMg5J27FehJgUm9HbNlRh0+7My9zv4MBPBBosRy06SmCQ TATcsoYkTDXtmVGGT+rA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iUNBk-0008Uf-Hc; Tue, 12 Nov 2019 03:49:56 +0000 Received: from szxga06-in.huawei.com ([45.249.212.32] helo=huawei.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iUNBh-0008UI-73 for linux-arm-kernel@lists.infradead.org; Tue, 12 Nov 2019 03:49:54 +0000 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 72B4782E77B507D15B6E; Tue, 12 Nov 2019 11:49:46 +0800 (CST) Received: from localhost (10.133.213.239) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.439.0; Tue, 12 Nov 2019 11:49:37 +0800 From: YueHaibing To: , , , , Subject: [PATCH v3 -next] fsi: aspeed: Fix aspeed device free Date: Tue, 12 Nov 2019 11:47:44 +0800 Message-ID: <20191112034744.10180-1-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 In-Reply-To: <20191109033634.30544-1-yuehaibing@huawei.com> References: <20191109033634.30544-1-yuehaibing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.133.213.239] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191111_194953_421290_3C4E695E X-CRM114-Status: GOOD ( 10.60 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [45.249.212.32 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-aspeed@lists.ozlabs.org, alistair@popple.id.au, YueHaibing , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-fsi@lists.ozlabs.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 'aspeed' is allocted by devm_kfree(), it should not be kfree(). In fact it will be freed while the device released. Also we grap reference after fsi_master_register() success, so should put it in fsi_master_aspeed_remove(). Fixes: 1edac1269c02 ("fsi: Add ast2600 master driver") Signed-off-by: YueHaibing --- v3: remove unneeded release() and put last reference v2: fix log typos --- drivers/fsi/fsi-master-aspeed.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c index f49742b..01a7f24 100644 --- a/drivers/fsi/fsi-master-aspeed.c +++ b/drivers/fsi/fsi-master-aspeed.c @@ -350,14 +350,6 @@ static int aspeed_master_break(struct fsi_master *master, int link) return aspeed_master_write(master, link, 0, addr, &cmd, 4); } -static void aspeed_master_release(struct device *dev) -{ - struct fsi_master_aspeed *aspeed = - to_fsi_master_aspeed(dev_to_fsi_master(dev)); - - kfree(aspeed); -} - /* mmode encoders */ static inline u32 fsi_mmode_crs0(u32 x) { @@ -483,7 +475,6 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev) dev_info(&pdev->dev, "hub version %08x (%d links)\n", reg, links); aspeed->master.dev.parent = &pdev->dev; - aspeed->master.dev.release = aspeed_master_release; aspeed->master.dev.of_node = of_node_get(dev_of_node(&pdev->dev)); aspeed->master.n_links = links; @@ -522,6 +513,7 @@ static int fsi_master_aspeed_remove(struct platform_device *pdev) fsi_master_unregister(&aspeed->master); clk_disable_unprepare(aspeed->clk); + put_device(&aspeed->master.dev); return 0; }