From patchwork Mon Sep 18 04:13:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Rameshbabu X-Patchwork-Id: 141297 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2503349vqi; Mon, 18 Sep 2023 01:20:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEotMl3Q2aYtNJ94I2qobosbVuXAC59G5rPAq+u1NXZGUtyKjTlXzBJ5C5h8nfxMYH+DweI X-Received: by 2002:a05:6808:18aa:b0:3a8:5133:4831 with SMTP id bi42-20020a05680818aa00b003a851334831mr12356540oib.50.1695025254373; Mon, 18 Sep 2023 01:20:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695025254; cv=pass; d=google.com; s=arc-20160816; b=XFZqTvPDdgju+Gqwl/SZxa373IFAA032WGtKt10Y0Yb1lc/ADuP6mtEZCGRNO9bnOA JCgR5cYweb6agodtBsGzYh0aWVhMNMioA/PbrLUjIzHn8bmH5th+Woi9a2EPkIK7IwER 3+2ZQDy+tqDGBxSlLsJnrQdtdaWALnwyFoB5fwhG9jKlZkgfgPaAELaYWQtyc7kf0SI+ mNlhCiUWLtfv6FqUNW5Wj1351jruMc3e16qqljmCrA1ezv/8MAEPPZhh2CNg6gTrKsEJ vj2ozBlCQZKSFymSqD8FoX04f1h76RQm7oC59za89lWhk3JwHn6gDhX3JeekDZB51dS3 H9+Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DDkAfZKRnYEYRLCh+DVXLuzacnaY5ysTyeoTP8bolCY=; fh=SikQoJLNpGF0HeiQJkcbVWYlrNXIBKXrenHYWqn1frM=; b=r3SGPY8lXpu41omQeBTXKGXdWsQcdRHx9o9vRPkyejAtmovmQ7F/aaPzsO+I7FRLna hkNnu1uYojYN2FSR+e9HViPL+pSr/wrR7l+qk/6ArqXil50A9e9fPMYrKDurvMy5KmVX GJRoapz9ecfKuspbpXHNKaRp7hrvFMy8FFrAeXijOM81+t2CQ7GFMmoz9REfTjg3gZoW bKUuhl1QQn/fug4vgxAD58rDIg7p+vUTICYn7RMeM5fOEVTOJVUHXxUHxyQuF5BcC6y2 fNi7VkBtEeljYYqHsCAylUm4OCSEX8w6QUNz7x0iu5iGvVeaF+a5PgDwyyZRYCdKGYYD 2DMw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@Nvidia.com header.s=selector2 header.b=J6aFPoIQ; arc=pass (i=1 spf=pass spfdomain=nvidia.com dkim=pass dkdomain=nvidia.com dmarc=pass fromdomain=nvidia.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=nvidia.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id z11-20020a6553cb000000b0055379a7131csi7498333pgr.721.2023.09.18.01.20.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 01:20:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@Nvidia.com header.s=selector2 header.b=J6aFPoIQ; arc=pass (i=1 spf=pass spfdomain=nvidia.com dkim=pass dkdomain=nvidia.com dmarc=pass fromdomain=nvidia.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=nvidia.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 663DC807F4BE; Sun, 17 Sep 2023 21:15:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239654AbjIREPT (ORCPT + 28 others); Mon, 18 Sep 2023 00:15:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239512AbjIREOj (ORCPT ); Mon, 18 Sep 2023 00:14:39 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2055.outbound.protection.outlook.com [40.107.212.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF615C6; Sun, 17 Sep 2023 21:14:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MX1VGqdqdnndUryxNZxQrCz41WPJDQ7M5E0FOBctU7wxYFM98bWK5COBzjMAD72qJjUAagocr0Ki8bfwt3HNi4NAp0qvGNCCD0BC9YhUu/5/AJyHrd+SRopHMvCztKoOpemFh7pG6h6EaYLHjNmk5hjzPvJNkclkOcZJJLYkKG1tPEl3ZNdqPpabNIQ0xnp0TjXdrkLwCf8TczILdsCWAEiiUPJK/wJQOorI8e0E+bMakVKBbmCWO/1CCJucrlgh9pV895ZzjyYWdLvUpxdmZ4S0e4AHydctZbFVGEPaNN1p5392XT6AAbLI8VUpuTneFOpeVrH0dmeOBHQxc/Xgpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DDkAfZKRnYEYRLCh+DVXLuzacnaY5ysTyeoTP8bolCY=; b=OeUFfSe9dtaohXWCg1wrE0WbPz8UP0KRhwVLoUPQNSrQhhiHgAblEqLrNuqCaYu1J2or6j7D8A/A5i7CYtzf1nut5XxDM117m1oEryLMSrMUYeYgx13KJAyKOo5aDtWP16uSHtB+fGxFTJwzFHWpiXiKr4SSBhCevD6fM88Z1wMLlxu/kfZXVbo7Rwl+lgGWd1K+lSfkjleoh2/pQGmlvHaAnXXfRCN73FmokgOsp2ptyXW/BXdzBEiHUzfgYdaPCgub9uEASLnxF4T2YaKIdIJZUsvb0C2mlGSiovstjwPTorI8ndh82VK9rzJbBDdrog7h/qcnu4kAeuEyjDSkjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DDkAfZKRnYEYRLCh+DVXLuzacnaY5ysTyeoTP8bolCY=; b=J6aFPoIQA6v3fI6o2odCFRxWfUq6N7nz3J3+EJN2j5z9xiVQyM6QQO2YINO3TVTb5HBWbmsktEJ9S1/HpnfAM+38nleAQ9Q+4ly9kPwgxWS/c4tDM8aJajyzHrBfH2243PmElPpYzurIfNL0ycuGYD/OxeTYuaEdmfYtvRfRqf1vN/6NunrDC/TGZeh6hymiTFemdQSK/IJw68uQ4Tdqi8BQjG3jsZHmcwAipkOSNozhQfZTTEE8GMpSknYyXRo8sUKS2X2p20WC88LECBpDKsBsvtqyz0/1JsBh82oa8/PimdfF+6dUTxPU2PKysh+HzpnOwEN/itXJmQeihdXDRw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BYAPR12MB2743.namprd12.prod.outlook.com (2603:10b6:a03:61::28) by SA1PR12MB5658.namprd12.prod.outlook.com (2603:10b6:806:235::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Mon, 18 Sep 2023 04:14:28 +0000 Received: from BYAPR12MB2743.namprd12.prod.outlook.com ([fe80::5cc1:1ea3:4ec5:72af]) by BYAPR12MB2743.namprd12.prod.outlook.com ([fe80::5cc1:1ea3:4ec5:72af%5]) with mapi id 15.20.6792.026; Mon, 18 Sep 2023 04:14:28 +0000 From: Rahul Rameshbabu To: Jiri Kosina , Benjamin Tissoires Cc: Christophe JAILLET , kernel-janitors@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Rahul Rameshbabu Subject: [PATCH v2 2/3] HID: nvidia-shield: Fix some missing function calls() in the probe error handling path Date: Sun, 17 Sep 2023 21:13:44 -0700 Message-Id: <20230918041345.59859-3-rrameshbabu@nvidia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230918041345.59859-1-rrameshbabu@nvidia.com> References: <20230918041345.59859-1-rrameshbabu@nvidia.com> X-ClientProxiedBy: SJ0PR03CA0073.namprd03.prod.outlook.com (2603:10b6:a03:331::18) To BYAPR12MB2743.namprd12.prod.outlook.com (2603:10b6:a03:61::28) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR12MB2743:EE_|SA1PR12MB5658:EE_ X-MS-Office365-Filtering-Correlation-Id: 0fc52610-ffda-402b-6c2c-08dbb7fdc03b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RA6CBe2zyDJThg1+mFse+qAXFzlNboKD5S/UGkJPArJY8odND57pDcpiBhKXl7uHf26iVZu7PQQNNW9AIuQ41vBnb+tgMPEAiMhRvsaiajLPf6g2kJNSLayFY51D3DF2yWxhpLoRoB6hM2aMrRKvIwbIObjhCVxvwrR0fYsg/TBtYzAIUa1XvkHalReDDwHeDVc/KLuQBZlsozDRCUD/wTydS6IIf42tABmVWTUESRxnxYVcmOekxh90N81aOlSeXywj015Lr0ao1Uic/Q9Us4X4wUsajIgH/mbiZlTQJyfIW0cR3BfL7tIVX1UDvLsfi6yfMRRRov8MpUMA/C2Ca/4wf9pFUXWWIUiaHjedwG9SUrsD16qLSg498X7eoNMBphYV7j/thn5P9x7wkZ4sCNRXR2IuIwUMiBksR4msv5TAbPC+ffKKHYB65+zZQ+BMCQu/8Cd760f/tZpEKF0AWkiyY9ooGAb5BDft5yh2s+epY9/uuL5/xhGIvusOquJUT8/692scB3pIyf3tssO9FXc1zwG509lrzfdV4w20h3oQ1Q+K80ZV4bgDXKZrNbvk X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR12MB2743.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39860400002)(376002)(396003)(366004)(346002)(451199024)(1800799009)(186009)(6486002)(5660300002)(6506007)(86362001)(6512007)(54906003)(316002)(66946007)(41300700001)(38100700002)(66556008)(66476007)(110136005)(6666004)(478600001)(2616005)(8936002)(8676002)(26005)(2906002)(36756003)(107886003)(1076003)(4326008)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LrOWrlG6qVhqMxEwgYFIw3LbIyZKdU3lMSoETLL10vWCBYLaTjta4bY0BPOsaE8l46K8E0owMekM/ESzV7VmGGGpSidq9IhfEe+D5407NwFCwNI2U0cLV6c+8f7+JBf/Ze7eIpWYk6+Rbsv+CBmluSaxCrJGd6qWl91Kpsxqf4PpjKB/etwPbbuAt3CDVFZc5zsPcPwSUlvDDhOD/uJ7LVSfo+dODHXTFi9LlPAdYYc/GcP3Yhi88VTLa0JZce3XN6mfAvOVstjzon3Pco+b6xj9/FOwHYUJkJS0UFsfIgbqJ0QATtBL8KnOjVZ0Y51190L5exZusDUK+rVM0Ejly/xbPljP8IlNttPRg4Ub8pgl7g6xQ8z0r6OuKA5kAQ3m8yPJZZpxLfg1RgudDozUWagkSqPMPskALSOtGQnv7+rzRia+uiZiYicpFCKTGexMDdA1V4wvG6ObqCR67JOmQOd33D+mk6G+zvy9U7DiRTktRCtweD49xG+qhOXEb/qjrDZKPkyz2Wb7ierAurve/BStNfgGi+e5kfw11MPpb6td5kpiJXl+ssC82ubWiu/TCjn5F2I3QOLqQC2ft/LNg/ClBHzgJYOrsykg44v+zhYaSdARhZQ1xBNFDoH8Y7qat3WnYOzBYwYwLik+oJ3zvQ3Et3TIdxqF8aIBjcE7bQ05hVfSreeZl0Bpo3LHJKW6YoirhgdlY4kxKR8uRurZHDjTNxxRIhryoaCZEKJb4f2GhloDq0g/DCMErThJNvdMFZ08gkQgrF+xnSwvPo9JRPWNsUyo4cDwtUorUAuh9KPpgK5zDHx4sWUEMrN5XicxQNnZZ9MzsEHnBKbjYhNx4q62FIz4/PR+Zr7/bf8qeVwi5U4UB1YVZyXA3phz0kNrmXn7lyBPn3Brjv5Mcd2abju23gvzd00pOa8959wo4iZoZM6/HNpFl6D9mVIOv1Ze9i7LQV1WG+GvBYglGNx5FRmm4qWGOaBkWx2E9LZOT926GZNagsqAXV739L/qpF+Qo1LnIqQGmjui3XQeDjeAVeJyW38XR67flWSeuCUisgNgkUcr/WmaJEaM15E27ityoBgmuMViDkgzkYitfL0eHOHe2Ku5Nw6Xup/miHiHwmCq3hqnAUMdPltJSYcy4RO35LQOrSHj/PSJlVlY66oAwFhayxZb2igFOt3gW0xLX03XC9d6sZRqItckClJd47xNSv0wslu+m1jKPaNWRfsSW7ldYuoirgTrdXm3Tcc8dKr6RHIGl0VIXR9plKRAr0DnKHqVsulFOuf92P1nf4iFt0Sd0EdXsywyUmOnP3xjlEby17S5aLv75rF+uRhOLhbFKhHjKNCWw+Xvuar1e2s9x2mm6fiKdC6WrCI42HP/4Cq52nSTwPZKTtFXQuSO/ecoBME6rMKMG2FGLnA8Z/h42BAN3FCNx8mo6/ZBJ2/xErs3frTIk4Pl5Bb6uoFlygRilypINdsi3SmsLji+xuBKZQTOrxNg0r6n5E8dLQOXvp/D+WMEYF41pEA77a7hJheowCBTqzCYR40l305QjmHF0Cqn+Sb3HSQuUDFc2zJ9BNBHudFSoV47i19E4EmeTUow X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0fc52610-ffda-402b-6c2c-08dbb7fdc03b X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB2743.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2023 04:14:28.4003 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6fqbvQ5MGM3AD/y1ghNjhIaXDaPdWEDYPZ7Fz7jgElRRwYF/47iNVAPEZZpfj+iGxbwkFDb1Bim35ZRYv0QlOQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5658 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (howler.vger.email [0.0.0.0]); Sun, 17 Sep 2023 21:15:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777362800745453965 X-GMAIL-MSGID: 1777362800745453965 From: Christophe JAILLET The commit in Fixes updated the error handling path of thunderstrike_create() and the remove function but not the error handling path of shield_probe(), should an error occur after a successful thunderstrike_create() call. Add the missing calls. Fixes: 3ab196f88237 ("HID: nvidia-shield: Add battery support for Thunderstrike") Signed-off-by: Christophe JAILLET Reviewed-by: Rahul Rameshbabu --- Notes: Changes: v1->v2: - Rename err_haptics label to err_ts_create to make the label name more accurate. drivers/hid/hid-nvidia-shield.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-nvidia-shield.c b/drivers/hid/hid-nvidia-shield.c index c144641452d3..a566f9cdc97d 100644 --- a/drivers/hid/hid-nvidia-shield.c +++ b/drivers/hid/hid-nvidia-shield.c @@ -1058,7 +1058,7 @@ static int shield_probe(struct hid_device *hdev, const struct hid_device_id *id) ret = hid_hw_start(hdev, HID_CONNECT_HIDINPUT); if (ret) { hid_err(hdev, "Failed to start HID device\n"); - goto err_haptics; + goto err_ts_create; } ret = hid_hw_open(hdev); @@ -1073,10 +1073,12 @@ static int shield_probe(struct hid_device *hdev, const struct hid_device_id *id) err_stop: hid_hw_stop(hdev); -err_haptics: +err_ts_create: + power_supply_unregister(ts->base.battery_dev.psy); if (ts->haptics_dev) input_unregister_device(ts->haptics_dev); led_classdev_unregister(&ts->led_dev); + ida_free(&thunderstrike_ida, ts->id); return ret; }