From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 887D6FC6196 for ; Fri, 8 Nov 2019 11:59:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55D7D207FA for ; Fri, 8 Nov 2019 11:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573214360; bh=xhf/4H4yFczKL2kdqA8IiqG5aMFJ7x0hqVi3LZjt9Bg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0iSfUhTwI5tqFw0OMQJwzKb4BiSrm7GgcNAsmAsoDcrNFUE9kSoocrWLr2ZxrICu3 YetYh++8k6A+iqfvZl0suD11kyK4v7zbXPveWskbFU0Qynj31G8jAbvJYnrVWxipBu hKDcQTNo5dsNbjdIi1ofaylyc4UT6sMlN1JHonEU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389079AbfKHLoV (ORCPT ); Fri, 8 Nov 2019 06:44:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:59202 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387547AbfKHLoT (ORCPT ); Fri, 8 Nov 2019 06:44:19 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1AF7821D6C; Fri, 8 Nov 2019 11:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213459; bh=xhf/4H4yFczKL2kdqA8IiqG5aMFJ7x0hqVi3LZjt9Bg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g4TkqG/lJJZNfJL37r7Sk2UKj5XXvhvnkhIExdLrqbzu9JqKJTrcBqTzp0sCGzEKY MyKlnn1ZwiIPQou+XrM+cHRI1UGMDXK6PuVSYIrn6xLmrcZg2B1z6S/2Zpo42eYTQn pDQnERxFkXaWQJVM/wFR43xb0E6A0Q14HWjhoafY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ding Xiang , Atsushi Nemoto , Paul Burton , ralf@linux-mips.org, jhogan@kernel.org, linux-mips@linux-mips.org, Sasha Levin , linux-mips@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 046/103] mips: txx9: fix iounmap related issue Date: Fri, 8 Nov 2019 06:42:11 -0500 Message-Id: <20191108114310.14363-46-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108114310.14363-1-sashal@kernel.org> References: <20191108114310.14363-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Ding Xiang [ Upstream commit c6e1241a82e6e74d1ae5cc34581dab2ffd6022d0 ] if device_register return error, iounmap should be called, also iounmap need to call before put_device. Signed-off-by: Ding Xiang Reviewed-by: Atsushi Nemoto Signed-off-by: Paul Burton Patchwork: https://patchwork.linux-mips.org/patch/20476/ Cc: ralf@linux-mips.org Cc: jhogan@kernel.org Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Sasha Levin --- arch/mips/txx9/generic/setup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index 1791a44ee570a..20aaf77166e85 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c @@ -959,12 +959,11 @@ void __init txx9_sramc_init(struct resource *r) goto exit_put; err = sysfs_create_bin_file(&dev->dev.kobj, &dev->bindata_attr); if (err) { - device_unregister(&dev->dev); iounmap(dev->base); - kfree(dev); + device_unregister(&dev->dev); } return; exit_put: + iounmap(dev->base); put_device(&dev->dev); - return; } -- 2.20.1