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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8C223C433F5 for ; Wed, 30 Mar 2022 11:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=b8tNfAA523047q4Z/N+OIkz2fsv+l6MBlHy0AVKxMWY=; b=DLyJlnmZZsFOSm t9513SR+qKrZLcoFyLpucB50nNGcfKRewAG+YIm1dI1iSZmsYb1+TcU8nqBs1XPbaO+ggk3D2Aw0i eIoonqo6gDfLR+60f1fRqxKF3QjSJPncFGxCqnd2w72Gbnrj5y0xexEbMzERoArb2jT7h/rzg0ZV7 hF/gEww6fca/iR2qEdT3PrU6DcJhuD2FEa2A2I+rEKeUiaiifCZ4ipORSBvBreRgjN1svvCTaSheZ J6EpZHKMmgElxRxvhq82hDOElHEri5Gio4/64s+eCdEd5l3FopRF6z76ForvVlTZKbbxFzhgAo67z DTEsxSBKZs+o7kEjZE9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nZWu0-00FScY-RK; Wed, 30 Mar 2022 11:54:18 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nZWns-00FP8h-CI for linux-arm-kernel@lists.infradead.org; Wed, 30 Mar 2022 11:47:59 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BFDB661640; Wed, 30 Mar 2022 11:47:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 841A0C36AE5; Wed, 30 Mar 2022 11:47:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648640875; bh=cmQjIDOiyu6i0WOxV+vP3qJn8wa2woRKYCESBKH7hvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RtIikrxqKF9Q2dG32JWGqYpNw6PJprQPc1S/ClYZjzkhp6k4MBPl9GQGi0r3MJYzH z488oZ/YjPkVvgY243D6LBCkqGEhy5Ehgvk13XZsgtBkX+FBq6A0BP9vK47nYAqY+R PZjIJnDy3TI9m/n1DMl6J30HqW5TY+08OgA/36fBJOAnb7NpnsVQKkTClonLYq2ScR 6G1X47yxLE8GWUsbKRPKuyveXClnEqf+xhpNgr4Poe9Jl1u6wH/paWWFQajSr5HSxO t3XwVUG3ZAbam1lhQ1LsEXraea4+Vkq0bB3KX99nxzRglSbD+KcuPsKyDmtdbyiKUw XFpp7rISGj+Yg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Greg Kroah-Hartman , Arnd Bergmann , Sasha Levin , eric.y.miao@gmail.com, haojian.zhuang@gmail.com, linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.17 44/66] ARM: mmp: Fix failure to remove sram device Date: Wed, 30 Mar 2022 07:46:23 -0400 Message-Id: <20220330114646.1669334-44-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330114646.1669334-1-sashal@kernel.org> References: <20220330114646.1669334-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220330_044756_515997_2C71E02A X-CRM114-Status: GOOD ( 17.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogVXdlIEtsZWluZS1Lw7ZuaWcgPHUua2xlaW5lLWtvZW5pZ0BwZW5ndXRyb25peC5kZT4K ClsgVXBzdHJlYW0gY29tbWl0IDQwMzZiMjlhMTQ2YjI3NDlhZjNiYjIxM2IwMDNlYjY5ZjNlNWVj YzQgXQoKTWFrZSBzdXJlIGluIC5wcm9iZSgpIHRvIHNldCBkcml2ZXIgZGF0YSBiZWZvcmUgdGhl IGZ1bmN0aW9uIGlzIGxlZnQgdG8KbWFrZSBpdCBwb3NzaWJsZSBpbiAucmVtb3ZlKCkgdG8gdW5k byB0aGUgYWN0aW9ucyBkb25lLgoKVGhpcyBmaXhlcyBhIHBvdGVudGlhbCBtZW1vcnkgbGVhayBh bmQgc3RvcHMgcmV0dXJuaW5nIGFuIGVycm9yIGNvZGUgaW4KLnJlbW92ZSgpIHRoYXQgaXMgaWdu b3JlZCBieSB0aGUgZHJpdmVyIGNvcmUgYW55aG93LgoKU2lnbmVkLW9mZi1ieTogVXdlIEtsZWlu ZS1Lw7ZuaWcgPHUua2xlaW5lLWtvZW5pZ0BwZW5ndXRyb25peC5kZT4KUmV2aWV3ZWQtYnk6IEdy ZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+ClNpZ25lZC1vZmYt Ynk6IEFybmQgQmVyZ21hbm4gPGFybmRAYXJuZGIuZGU+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExl dmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBhcmNoL2FybS9tYWNoLW1tcC9zcmFtLmMgfCAy MiArKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygr KSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1tbXAvc3JhbS5j IGIvYXJjaC9hcm0vbWFjaC1tbXAvc3JhbS5jCmluZGV4IDY3OTRlMmRiMWFkNS4uZWNjNDZjMzEw MDRmIDEwMDY0NAotLS0gYS9hcmNoL2FybS9tYWNoLW1tcC9zcmFtLmMKKysrIGIvYXJjaC9hcm0v bWFjaC1tbXAvc3JhbS5jCkBAIC03Miw2ICs3Miw4IEBAIHN0YXRpYyBpbnQgc3JhbV9wcm9iZShz dHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCWlmICghaW5mbykKIAkJcmV0dXJuIC1FTk9N RU07CiAKKwlwbGF0Zm9ybV9zZXRfZHJ2ZGF0YShwZGV2LCBpbmZvKTsKKwogCXJlcyA9IHBsYXRm b3JtX2dldF9yZXNvdXJjZShwZGV2LCBJT1JFU09VUkNFX01FTSwgMCk7CiAJaWYgKHJlcyA9PSBO VUxMKSB7CiAJCWRldl9lcnIoJnBkZXYtPmRldiwgIm5vIG1lbW9yeSByZXNvdXJjZSBkZWZpbmVk XG4iKTsKQEAgLTEwNyw4ICsxMDksNiBAQCBzdGF0aWMgaW50IHNyYW1fcHJvYmUoc3RydWN0IHBs YXRmb3JtX2RldmljZSAqcGRldikKIAlsaXN0X2FkZCgmaW5mby0+bm9kZSwgJnNyYW1fYmFua19s aXN0KTsKIAltdXRleF91bmxvY2soJnNyYW1fbG9jayk7CiAKLQlwbGF0Zm9ybV9zZXRfZHJ2ZGF0 YShwZGV2LCBpbmZvKTsKLQogCWRldl9pbmZvKCZwZGV2LT5kZXYsICJpbml0aWFsaXplZFxuIik7 CiAJcmV0dXJuIDA7CiAKQEAgLTEyNywxNyArMTI3LDE5IEBAIHN0YXRpYyBpbnQgc3JhbV9yZW1v dmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlzdHJ1Y3Qgc3JhbV9iYW5rX2luZm8g KmluZm87CiAKIAlpbmZvID0gcGxhdGZvcm1fZ2V0X2RydmRhdGEocGRldik7Ci0JaWYgKGluZm8g PT0gTlVMTCkKLQkJcmV0dXJuIC1FTk9ERVY7CiAKLQltdXRleF9sb2NrKCZzcmFtX2xvY2spOwot CWxpc3RfZGVsKCZpbmZvLT5ub2RlKTsKLQltdXRleF91bmxvY2soJnNyYW1fbG9jayk7CisJaWYg KGluZm8tPnNyYW1fc2l6ZSkgeworCQltdXRleF9sb2NrKCZzcmFtX2xvY2spOworCQlsaXN0X2Rl bCgmaW5mby0+bm9kZSk7CisJCW11dGV4X3VubG9jaygmc3JhbV9sb2NrKTsKKworCQlnZW5fcG9v bF9kZXN0cm95KGluZm8tPmdwb29sKTsKKwkJaW91bm1hcChpbmZvLT5zcmFtX3ZpcnQpOworCQlr ZnJlZShpbmZvLT5wb29sX25hbWUpOworCX0KIAotCWdlbl9wb29sX2Rlc3Ryb3koaW5mby0+Z3Bv b2wpOwotCWlvdW5tYXAoaW5mby0+c3JhbV92aXJ0KTsKLQlrZnJlZShpbmZvLT5wb29sX25hbWUp OwogCWtmcmVlKGluZm8pOworCiAJcmV0dXJuIDA7CiB9CiAKLS0gCjIuMzQuMQoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwg bWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8v bGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD756C433F5 for ; Wed, 30 Mar 2022 11:50:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344016AbiC3LwJ (ORCPT ); Wed, 30 Mar 2022 07:52:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343901AbiC3LvX (ORCPT ); Wed, 30 Mar 2022 07:51:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EF6827429A; Wed, 30 Mar 2022 04:47:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C64DCB81C35; Wed, 30 Mar 2022 11:47:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 841A0C36AE5; Wed, 30 Mar 2022 11:47:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648640875; bh=cmQjIDOiyu6i0WOxV+vP3qJn8wa2woRKYCESBKH7hvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RtIikrxqKF9Q2dG32JWGqYpNw6PJprQPc1S/ClYZjzkhp6k4MBPl9GQGi0r3MJYzH z488oZ/YjPkVvgY243D6LBCkqGEhy5Ehgvk13XZsgtBkX+FBq6A0BP9vK47nYAqY+R PZjIJnDy3TI9m/n1DMl6J30HqW5TY+08OgA/36fBJOAnb7NpnsVQKkTClonLYq2ScR 6G1X47yxLE8GWUsbKRPKuyveXClnEqf+xhpNgr4Poe9Jl1u6wH/paWWFQajSr5HSxO t3XwVUG3ZAbam1lhQ1LsEXraea4+Vkq0bB3KX99nxzRglSbD+KcuPsKyDmtdbyiKUw XFpp7rISGj+Yg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Greg Kroah-Hartman , Arnd Bergmann , Sasha Levin , eric.y.miao@gmail.com, haojian.zhuang@gmail.com, linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.17 44/66] ARM: mmp: Fix failure to remove sram device Date: Wed, 30 Mar 2022 07:46:23 -0400 Message-Id: <20220330114646.1669334-44-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330114646.1669334-1-sashal@kernel.org> References: <20220330114646.1669334-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Uwe Kleine-König [ Upstream commit 4036b29a146b2749af3bb213b003eb69f3e5ecc4 ] Make sure in .probe() to set driver data before the function is left to make it possible in .remove() to undo the actions done. This fixes a potential memory leak and stops returning an error code in .remove() that is ignored by the driver core anyhow. Signed-off-by: Uwe Kleine-König Reviewed-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/mach-mmp/sram.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-mmp/sram.c b/arch/arm/mach-mmp/sram.c index 6794e2db1ad5..ecc46c31004f 100644 --- a/arch/arm/mach-mmp/sram.c +++ b/arch/arm/mach-mmp/sram.c @@ -72,6 +72,8 @@ static int sram_probe(struct platform_device *pdev) if (!info) return -ENOMEM; + platform_set_drvdata(pdev, info); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (res == NULL) { dev_err(&pdev->dev, "no memory resource defined\n"); @@ -107,8 +109,6 @@ static int sram_probe(struct platform_device *pdev) list_add(&info->node, &sram_bank_list); mutex_unlock(&sram_lock); - platform_set_drvdata(pdev, info); - dev_info(&pdev->dev, "initialized\n"); return 0; @@ -127,17 +127,19 @@ static int sram_remove(struct platform_device *pdev) struct sram_bank_info *info; info = platform_get_drvdata(pdev); - if (info == NULL) - return -ENODEV; - mutex_lock(&sram_lock); - list_del(&info->node); - mutex_unlock(&sram_lock); + if (info->sram_size) { + mutex_lock(&sram_lock); + list_del(&info->node); + mutex_unlock(&sram_lock); + + gen_pool_destroy(info->gpool); + iounmap(info->sram_virt); + kfree(info->pool_name); + } - gen_pool_destroy(info->gpool); - iounmap(info->sram_virt); - kfree(info->pool_name); kfree(info); + return 0; } -- 2.34.1