From patchwork Wed Nov 8 12:56:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Bachinin X-Patchwork-Id: 163001 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp891397vqo; Wed, 8 Nov 2023 04:57:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpZbTBoslL6/sP13cyquI3vAB3LTy/TVASIHd+UMiedlYshaCRULDVOYh94elpYbev/Tle X-Received: by 2002:a05:6a20:96d1:b0:180:d33d:9256 with SMTP id hq17-20020a056a2096d100b00180d33d9256mr1408821pzc.58.1699448250670; Wed, 08 Nov 2023 04:57:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699448250; cv=none; d=google.com; s=arc-20160816; b=De+2mvj3gonHQMmd7FzzuaiK01sXowV+bQizTzCG+bnUZDPZOu0++OiTyAfoADg6mW 0NX4/tzX2QBWJkCK8/fZvY5M+Q3EmgHbeKnzC2Av2HUg48h4gd16t5saYjCqYgTbCFBH NR6zkS0TzoskHX+H/KoK+32y2qVMfRl5uRL6q8Nld3StNuvhzaowRLLMIXT31vOnepbv g52kJA69gDWyokns80EXSez0Kwrf7481RVlNGAYsNDFM7FilupFsHfmR8XDKawC5UfGn +xJjkt4bmHgeZSEWFu4Qua5rpdypQuE42rkR9tViPeBgooml59uBHIv996gmOzlW7/Yb f2QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=73YJxpyKrfQZjMMYETXxSzxu5XhjcgY9c/ld2sap6w8=; fh=0AE460OZJFTNdZVCaErkEDAIe9NCf6r6sYaEen+oZ9Y=; b=0GVYMxI3LfQgEMC4sDhCJ8jG9+6o/kW9Cg7fO20zQYrqZeK8TZEcHa2c6PMvolgkOU Ks8bTz2WTqu9GX/Umk9KXRqFctTYZUTd7cfztaomW/mXfT81AeqbocXB/lCFoqW2OtKo vjHzmhcZJ2XFghrdT6UjiAwI4m26HnKeZOX4sjhSIB2MZD+lM85oSXVN1zXHl50BNIKi 1eYanBdNETAS7MeDSqEAcIYtgUQozZZm4N0OqeGk5Thed8oP8dvmlzu+sr0J/S6YoB2X ZgrcKQOiK3sU1focYLeHZHB/H9T2pdc42efOkSX5BYNncW9p97b/GdtWkEf9KzkEeoe1 8t/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=WkehRfNp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id ca33-20020a056a0206a100b005b911c438b5si4939000pgb.362.2023.11.08.04.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 04:57:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=WkehRfNp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 4F884826CB4E; Wed, 8 Nov 2023 04:57:26 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344539AbjKHM5N (ORCPT + 32 others); Wed, 8 Nov 2023 07:57:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234691AbjKHM5M (ORCPT ); Wed, 8 Nov 2023 07:57:12 -0500 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C3991BF7 for ; Wed, 8 Nov 2023 04:57:09 -0800 (PST) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 878F6120007; Wed, 8 Nov 2023 15:57:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 878F6120007 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1699448227; bh=73YJxpyKrfQZjMMYETXxSzxu5XhjcgY9c/ld2sap6w8=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=WkehRfNprPkAjldqLgYlSoymSgsc2+zIApNxi6F8mrZNHKSCou8BTz+LASJO8ihAO tMlZypl0xezt6PdmYbjA6Dnr19LqqD0NKUUHW3/OXJKg9/EqSGAdLda3P3Bp8ajYFl 3IgU5Gi3a4B5W/md/xPg2OKwmehqGOlMz/lI8ZjPdpLZEW8BVYUxXzLUZcZ+QBHo8E M0fgsDFIy8Ca1qeF6DG3i7pQkry5SzSeH2yEJxhAoo2OSr/FrWrqneblPtT6kjcrzT 8N0nSVu7Be/RgsmW8cOK3tZ/XpM69yJ0RLpcLwCFiQevtntBL0mrT/Fm7G4DDo4x/n /Fdxfi79rCIaQ== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 8 Nov 2023 15:57:07 +0300 (MSK) Received: from pc (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Wed, 8 Nov 2023 15:57:07 +0300 From: Evgeny Bachinin To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Evgeny Bachinin , Dmitry Rokosov , Miles Chen , Alexey Romanov CC: , , , , Subject: [PATCH v1 1/2] firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs Date: Wed, 8 Nov 2023 15:56:03 +0300 Message-ID: <20231108125604.162383-2-EABachinin@salutedevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231108125604.162383-1-EABachinin@salutedevices.com> References: <20231108125604.162383-1-EABachinin@salutedevices.com> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 181206 [Nov 08 2023] X-KSMG-AntiSpam-Version: 6.0.0.2 X-KSMG-AntiSpam-Envelope-From: eabachinin@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 543 543 1e3516af5cdd92079dfeb0e292c8747a62cb1ee4, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;salutedevices.com:7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;100.64.160.123:7.1.2, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/11/08 12:09:00 #22428609 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 08 Nov 2023 04:57:26 -0800 (PST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782000648680757141 X-GMAIL-MSGID: 1782000648680757141 Introduce just another way to register sysfs serial entry: the less code, the better in the absence of extra error-paths Signed-off-by: Evgeny Bachinin --- drivers/firmware/meson/meson_sm.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c index 27a8cd4747f8..73878ff9833c 100644 --- a/drivers/firmware/meson/meson_sm.c +++ b/drivers/firmware/meson/meson_sm.c @@ -273,14 +273,11 @@ static ssize_t serial_show(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RO(serial); -static struct attribute *meson_sm_sysfs_attributes[] = { +static struct attribute *meson_sm_sysfs_attrs[] = { &dev_attr_serial.attr, NULL, }; - -static const struct attribute_group meson_sm_sysfs_attr_group = { - .attrs = meson_sm_sysfs_attributes, -}; +ATTRIBUTE_GROUPS(meson_sm_sysfs); static const struct of_device_id meson_sm_ids[] = { { .compatible = "amlogic,meson-gxbb-sm", .data = &gxbb_chip }, @@ -320,9 +317,6 @@ static int __init meson_sm_probe(struct platform_device *pdev) if (devm_of_platform_populate(dev)) goto out_in_base; - if (sysfs_create_group(&pdev->dev.kobj, &meson_sm_sysfs_attr_group)) - goto out_in_base; - pr_info("secure-monitor enabled\n"); return 0; @@ -337,6 +331,7 @@ static struct platform_driver meson_sm_driver = { .driver = { .name = "meson-sm", .of_match_table = of_match_ptr(meson_sm_ids), + .dev_groups = meson_sm_sysfs_groups, }, }; module_platform_driver_probe(meson_sm_driver, meson_sm_probe); From patchwork Wed Nov 8 12:56:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Bachinin X-Patchwork-Id: 163002 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp891503vqo; Wed, 8 Nov 2023 04:57:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHSjKLMxM/VVHuOh2kZ5R2Q+oUKVpPhTiaihRD7OTvH0MN6xDzoncWRUZnsX5iHC6yBTxQl X-Received: by 2002:a05:6808:1913:b0:3a9:ba39:6d6e with SMTP id bf19-20020a056808191300b003a9ba396d6emr2536152oib.0.1699448263778; Wed, 08 Nov 2023 04:57:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699448263; cv=none; d=google.com; s=arc-20160816; b=og8aU0MYniDYac5lW7IS6sf4XTxkk4cqRg/EyeZX+6Kq9j6VnhoJId7reWrFkx6KyA dmVEgFBJpvVCOFCR5cl/gVRicV0WBJ+En9QX3wG9GMhZC8iaV9IUFZTyO/s634QkW6OV LfwAQfeiMgTZgCeAxrVfCAQN3Lcr8F8cAXFHFf2jZztn+rmEItzQUgXtzffR6lALgnm+ D10QSRL+NA00LQ9eZYcJSpS8LMTrPRe/bZbeI+A0O3/RohqlNFSv9HTOsmL/v9PL8jq7 NnOyfRunt9UFEyAh3+QKebMvej3nJLbrz8qXd56AyWU7q1UE/SDbXy7wfpzfFNP0ZhzR LZDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=lEL9hzC+yiSK5zTbNOAn5LFfqRWf2kGLJXMdItJSVyA=; fh=0AE460OZJFTNdZVCaErkEDAIe9NCf6r6sYaEen+oZ9Y=; b=Mq0QCyaOiOgY1bleYCeSFGzSlGRG9HM1OtJb6PtBPjQmAnombgKlkfYLNoV0t5MQcB k8mQA2PtlQ9g7QjGMA1I+BulgqxMoAJ7+JEv+PH5SIaKfF0TLXAWEWiUCJlmcz1wQ0ZF 8wZ2/6E4lcnlWvH3QFA51xsoocpYOVeXMWaH3xymoezVf51lKMhqrFwiXTMPvS5fnAqy JWtLxOkuWbbwp9/0oaYiMU/4SezhFNasj6fS9jG4vPdieR+BfqLF6PNJSiXTdaORTDep BH8FN7MxqXbU/8JbCHjYo8u4sEUWJGgA5vDhfSOL4cof3uk9qHcuo1B7pQFw7H1A9o98 kGVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=oYJ2iqyi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id u184-20020a6385c1000000b005b11e5a69f8si4130985pgd.531.2023.11.08.04.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 04:57:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=oYJ2iqyi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 471F6826E749; Wed, 8 Nov 2023 04:57:41 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344584AbjKHM5T (ORCPT + 32 others); Wed, 8 Nov 2023 07:57:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344552AbjKHM5R (ORCPT ); Wed, 8 Nov 2023 07:57:17 -0500 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E8781BFE for ; Wed, 8 Nov 2023 04:57:14 -0800 (PST) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 90A93100031; Wed, 8 Nov 2023 15:57:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 90A93100031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1699448232; bh=lEL9hzC+yiSK5zTbNOAn5LFfqRWf2kGLJXMdItJSVyA=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=oYJ2iqyiUotP9czMjrfyU8wlpc0texQiVRLNMkG2/hyauuls9B3s6Rvh4QaHh4QnX f5gigcnypL2BllMlJnzGyqw34HZA7qzHVDg5IJ6PO50AyO7w/HfYBG9FRT4HBlfgAC MZ8Wpgb/cXI+hLB/W9+4NL5510IqsnoAyXaIpdBHTTzC2NB22AZH5xe2jfgrhbQoqU WXWHcK8/C9Lr3hY8BJ6yPkPm7sgG99vToGBx4q4Q6AJlbYUosybUH5iZKKbWFntjfE hLkjyMQmcfWjK/Mrzwpy7NnfUfM1MPnFuB4Ts041BQfu4du6rGyLSXQ+WFoEU+9YSF zXB+wZ7Ehedqg== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 8 Nov 2023 15:57:12 +0300 (MSK) Received: from pc (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Wed, 8 Nov 2023 15:57:12 +0300 From: Evgeny Bachinin To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Evgeny Bachinin , Dmitry Rokosov , Miles Chen , Alexey Romanov CC: , , , , Subject: [PATCH v1 2/2] firmware: meson-sm: unmap out_base shmem in error path Date: Wed, 8 Nov 2023 15:56:04 +0300 Message-ID: <20231108125604.162383-3-EABachinin@salutedevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231108125604.162383-1-EABachinin@salutedevices.com> References: <20231108125604.162383-1-EABachinin@salutedevices.com> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 181206 [Nov 08 2023] X-KSMG-AntiSpam-Version: 6.0.0.2 X-KSMG-AntiSpam-Envelope-From: eabachinin@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 543 543 1e3516af5cdd92079dfeb0e292c8747a62cb1ee4, {Tracking_uf_ne_domains}, {Tracking_from_domain_doesnt_match_to}, 100.64.160.123:7.1.2;lore.kernel.org:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;salutedevices.com:7.1.1;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2023/11/08 08:59:00 X-KSMG-LinksScanning: Clean, bases: 2023/11/08 08:57:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/11/08 08:25:00 #22426097 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 08 Nov 2023 04:57:41 -0800 (PST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782000663042947102 X-GMAIL-MSGID: 1782000663042947102 When SM driver was introduced in [1], the code flow did not require to unmap out_base shmem in case of errors inside probe(). During [2], the additional error path appeared, which requires unmap. Patch adds iounmap() missed. Links: [1] https://lore.kernel.org/linux-amlogic/1466339944-602-2-git-send-email-carlo@caione.org/ [2] https://lore.kernel.org/linux-amlogic/1532613556-5398-1-git-send-email-narmstrong@baylibre.com/ Fixes: 0789724f86a5 ("firmware: meson_sm: Add serial number sysfs entry") Signed-off-by: Evgeny Bachinin --- drivers/firmware/meson/meson_sm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c index 73878ff9833c..ca5f3534eddd 100644 --- a/drivers/firmware/meson/meson_sm.c +++ b/drivers/firmware/meson/meson_sm.c @@ -307,7 +307,7 @@ static int __init meson_sm_probe(struct platform_device *pdev) fw->sm_shmem_out_base = meson_sm_map_shmem(chip->cmd_shmem_out_base, chip->shmem_size); if (WARN_ON(!fw->sm_shmem_out_base)) - goto out_in_base; + goto unmap_in_base; } fw->chip = chip; @@ -315,13 +315,15 @@ static int __init meson_sm_probe(struct platform_device *pdev) platform_set_drvdata(pdev, fw); if (devm_of_platform_populate(dev)) - goto out_in_base; + goto unmap_out_base; pr_info("secure-monitor enabled\n"); return 0; -out_in_base: +unmap_out_base: + iounmap(fw->sm_shmem_out_base); +unmap_in_base: iounmap(fw->sm_shmem_in_base); out: return -EINVAL;