From patchwork Sat Nov 28 13:44:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 11938531 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=-12.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MIME_BASE64_TEXT,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 F3A32C63777 for ; Sat, 28 Nov 2020 22:24:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9EF2D222C2 for ; Sat, 28 Nov 2020 22:24:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="DJ/nfbKG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730846AbgK1VtU (ORCPT ); Sat, 28 Nov 2020 16:49:20 -0500 Received: from mout.gmx.net ([212.227.15.19]:42797 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728495AbgK1SBn (ORCPT ); Sat, 28 Nov 2020 13:01:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1606586410; bh=llOEp7TKQR/EGzhXDacWl6woOORc2KNFI1XW/Ng1WBE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=DJ/nfbKGA6OwjBY2mp6hbCcOIirJNfKNpSO7kJn1PuSzwvcjqecLXZTAjrFoQ1VMx CBQMAUjjJXiXKF3bY3ZyVdNQHACYvU2zzn7vKRVKgPzxkX8bfEfxgvnb8aB8XM7Nxm cxOX42gAEFQFRlCuQDmnlYVKPTm7T9j3JY7wKJdE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from Venus.fritz.box ([78.42.220.31]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N4QsO-1k1f4F49ag-011S5k; Sat, 28 Nov 2020 14:45:42 +0100 From: Lino Sanfilippo To: jic23@kernel.org Cc: andy.shevchenko@gmail.com, lars@metafoo.de, pmeerw@pmeerw.net, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Lino Sanfilippo Subject: [RESEND PATCH 2/2] io:core: In iio_map_array_register() cleanup in case of error Date: Sat, 28 Nov 2020 14:44:19 +0100 Message-Id: <1606571059-13974-2-git-send-email-LinoSanfilippo@gmx.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1606571059-13974-1-git-send-email-LinoSanfilippo@gmx.de> References: <1606571059-13974-1-git-send-email-LinoSanfilippo@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:42saRdxZ6O4sXs+ITGkakIE0b5eMR+hUo7mlPXHk4FtfBar2KNJ TqMXXQOA/UYgWTjPDT8zT05SLCRCfXUBA0s0Ss+thXqER5ZeLG4DYrCx2dkC6truEyGznp6 vClgHCNLnSe62YVHnDEBZlgxQzg+fCqezVMpOvH+P0hrWkx0KOgsRRPj2NjoDkX7fWAgVC4 JvqZPRYgT/rzIqCvLbUFQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:g9bbeuahMiQ=:ssS7esfd+e8zblSYq5aV44 2ckzlX5Ha/IjZ/jI5KpM7aNqIZUNH6ZHhaZt8MjXBT1/ESZ/4t/c8/JJXyz3IWUK300mZE2hV OOfieIqXmzyw7xTZwkga4P5HcVEdd40avx2+rc64saYPXVq1kyfZHj1ZPnSMaEwjWpuxefGgy aQF3gVLlDRlhtZxIF9Rz2EGKYzpBTj2KfO8yywlmvjAsA7Y9jOmsnOLWnVMKcbPcLYbSf5CXT E1ctokGfs1V1QfQujR5u/pnjCpLixXXd+B5jkc4BrTHAVS8031Fb3OpZnbSWiFHY5GM070lMN DMu9eCewgtIKMwbWOz7dyq5I8oCqPWFKZWTLEIHZ5UDA9kD/2U6tXQanh9YnWhOmk+H08aTE5 4JIfK4DVBMNV7WiID8aoa/D93fclGkqgdJs+0m4g/pEwRUpEahptav/wtcaNieI5sgm4qWxkt uTeLh+ayDsIgVPkwFl406No678sWPhK9soHnBet71tFukXRDcaUiY4zQuP8RPmg1J3o+0NDpL EdYCMUJN2C4HzIZDm4msMJTePFLiER3MXBNnyPkv/wN7gtyEZkKZtxbR8piMoer5bhhujFQVI jK2X1quyuqQ3Ip6QdoGMN0aHvbcvtq9ONDJb2fG3uOeo2+tn+jULHQkljy1LWKBvv8Fzkrkq6 nxUMn3c0zkiOxnFB1/S4OKgYPBL8DelTmcjuHbLO4XOAdym7T7K9k5OVkTevTkofYEvFDOXup MiRRH6lhN+EmiS281CmslUEm/fQszY3BiJUt/RxGl21plrxulAHkpUX23GeIZ8JGOzzWDJo6e LjwBOP3rfHkoqWqfRnphPaObfHv10y5UrKxbs2vXOhbkvjz4XKLcvgHx0BjVjMKYnjLlJadIP F24gpLOFcn4cs6U/C5qg== Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org In function iio_map_array_register() properly rewind in case of error. Signed-off-by: Lino Sanfilippo Reviewed-by: Andy Shevchenko --- drivers/iio/inkern.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c index 39c1d63..fe30bcb 100644 --- a/drivers/iio/inkern.c +++ b/drivers/iio/inkern.c @@ -60,6 +60,8 @@ int iio_map_array_register(struct iio_dev *indio_dev, struct iio_map *maps) i++; } error_ret: + if (ret) + iio_map_array_unregister_locked(indio_dev); mutex_unlock(&iio_map_list_lock); return ret;