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;
From:   Rahul Rameshbabu <rrameshbabu@nvidia.com>
To:     Jiri Kosina <jikos@kernel.org>,
        Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc:     Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        kernel-janitors@vger.kernel.org, linux-input@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Rahul Rameshbabu <rrameshbabu@nvidia.com>
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>
In-Reply-To: <20230918041345.59859-1-rrameshbabu@nvidia.com>
References: <20230918041345.59859-1-rrameshbabu@nvidia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LrOWrlG6qVhqMxEwgYFIw3LbIyZKdU3lMSoETLL10vWCBYLaTjta4bY0BPOs?=
 =?us-ascii?Q?aE8l46K8E0owMekM/ESzV7VmGGGpSidq9IhfEe+D5407NwFCwNI2U0cLV6c+?=
 =?us-ascii?Q?8f7+JBf/Ze7eIpWYk6+Rbsv+CBmluSaxCrJGd6qWl91Kpsxqf4PpjKB/etwP?=
 =?us-ascii?Q?bbuAt3CDVFZc5zsPcPwSUlvDDhOD/uJ7LVSfo+dODHXTFi9LlPAdYYc/GcP3?=
 =?us-ascii?Q?Yhi88VTLa0JZce3XN6mfAvOVstjzon3Pco+b6xj9/FOwHYUJkJS0UFsfIgbq?=
 =?us-ascii?Q?J0QATtBL8KnOjVZ0Y51190L5exZusDUK+rVM0Ejly/xbPljP8IlNttPRg4Ub?=
 =?us-ascii?Q?8pgl7g6xQ8z0r6OuKA5kAQ3m8yPJZZpxLfg1RgudDozUWagkSqPMPskALSOt?=
 =?us-ascii?Q?GQnv7+rzRia+uiZiYicpFCKTGexMDdA1V4wvG6ObqCR67JOmQOd33D+mk6G+?=
 =?us-ascii?Q?zvy9U7DiRTktRCtweD49xG+qhOXEb/qjrDZKPkyz2Wb7ierAurve/BStNfgG?=
 =?us-ascii?Q?i+e5kfw11MPpb6td5kpiJXl+ssC82ubWiu/TCjn5F2I3QOLqQC2ft/LNg/Cl?=
 =?us-ascii?Q?BHzgJYOrsykg44v+zhYaSdARhZQ1xBNFDoH8Y7qat3WnYOzBYwYwLik+oJ3z?=
 =?us-ascii?Q?vQ3Et3TIdxqF8aIBjcE7bQ05hVfSreeZl0Bpo3LHJKW6YoirhgdlY4kxKR8u?=
 =?us-ascii?Q?RurZHDjTNxxRIhryoaCZEKJb4f2GhloDq0g/DCMErThJNvdMFZ08gkQgrF+x?=
 =?us-ascii?Q?nSwvPo9JRPWNsUyo4cDwtUorUAuh9KPpgK5zDHx4sWUEMrN5XicxQNnZZ9Mz?=
 =?us-ascii?Q?sEHnBKbjYhNx4q62FIz4/PR+Zr7/bf8qeVwi5U4UB1YVZyXA3phz0kNrmXn7?=
 =?us-ascii?Q?lyBPn3Brjv5Mcd2abju23gvzd00pOa8959wo4iZoZM6/HNpFl6D9mVIOv1Ze?=
 =?us-ascii?Q?9i7LQV1WG+GvBYglGNx5FRmm4qWGOaBkWx2E9LZOT926GZNagsqAXV739L/q?=
 =?us-ascii?Q?pF+Qo1LnIqQGmjui3XQeDjeAVeJyW38XR67flWSeuCUisgNgkUcr/WmaJEaM?=
 =?us-ascii?Q?15E27ityoBgmuMViDkgzkYitfL0eHOHe2Ku5Nw6Xup/miHiHwmCq3hqnAUMd?=
 =?us-ascii?Q?PltJSYcy4RO35LQOrSHj/PSJlVlY66oAwFhayxZb2igFOt3gW0xLX03XC9d6?=
 =?us-ascii?Q?sZRqItckClJd47xNSv0wslu+m1jKPaNWRfsSW7ldYuoirgTrdXm3Tcc8dKr6?=
 =?us-ascii?Q?RHIGl0VIXR9plKRAr0DnKHqVsulFOuf92P1nf4iFt0Sd0EdXsywyUmOnP3xj?=
 =?us-ascii?Q?lEby17S5aLv75rF+uRhOLhbFKhHjKNCWw+Xvuar1e2s9x2mm6fiKdC6WrCI4?=
 =?us-ascii?Q?2HP/4Cq52nSTwPZKTtFXQuSO/ecoBME6rMKMG2FGLnA8Z/h42BAN3FCNx8mo?=
 =?us-ascii?Q?6/ZBJ2/xErs3frTIk4Pl5Bb6uoFlygRilypINdsi3SmsLji+xuBKZQTOrxNg?=
 =?us-ascii?Q?0r6n5E8dLQOXvp/D+WMEYF41pEA77a7hJheowCBTqzCYR40l305QjmHF0Cqn?=
 =?us-ascii?Q?+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: <linux-kernel.vger.kernel.org>
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:46 -0700 (PDT)

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

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 <christophe.jaillet@wanadoo.fr>
Reviewed-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
---

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;
 }
 
-- 
2.40.1