From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
To: rrameshbabu@nvidia.com, jikos@kernel.org, benjamin.tissoires@redhat.com
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Subject: [PATCH 2/3] HID: nvidia-shield: Fix some missing function calls() in the probe error handling path
Date: Sat, 26 Aug 2023 19:42:18 +0200 [thread overview]
Message-ID: <443aef6a6d90011e8fffcd43e1a88cd9e98594ca.1693070958.git.christophe.jaillet@wanadoo.fr> (raw)
In-Reply-To: <cover.1693070958.git.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>
---
drivers/hid/hid-nvidia-shield.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/hid/hid-nvidia-shield.c b/drivers/hid/hid-nvidia-shield.c
index 66a7478e2c9d..849b3f8409a0 100644
--- a/drivers/hid/hid-nvidia-shield.c
+++ b/drivers/hid/hid-nvidia-shield.c
@@ -1074,9 +1074,11 @@ static int shield_probe(struct hid_device *hdev, const struct hid_device_id *id)
err_stop:
hid_hw_stop(hdev);
err_haptics:
+ 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.34.1
next prev parent reply other threads:[~2023-08-26 17:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-26 17:42 [PATCH 0/3] HID: nvidia-shield: Fix the error handling path of shield_probe() Christophe JAILLET
2023-08-26 17:42 ` [PATCH 1/3] HID: nvidia-shield: Fix a missing led_classdev_unregister() in the probe error handling path Christophe JAILLET
2023-08-27 19:41 ` Rahul Rameshbabu
2023-08-26 17:42 ` Christophe JAILLET [this message]
2023-08-27 19:42 ` [PATCH 2/3] HID: nvidia-shield: Fix some missing function calls() " Rahul Rameshbabu
2023-08-26 17:42 ` [PATCH 3/3] HID: nvidia-shield: Introduce thunderstrike_destroy() Christophe JAILLET
2023-08-26 20:00 ` kernel test robot
2023-08-26 21:13 ` Christophe JAILLET
2023-08-27 19:41 ` Rahul Rameshbabu
2023-08-26 21:43 ` kernel test robot
2023-08-27 19:41 ` [PATCH 0/3] HID: nvidia-shield: Fix the error handling path of shield_probe() Rahul Rameshbabu
2023-09-15 18:16 ` Rahul Rameshbabu
2023-09-15 20:14 ` Christophe JAILLET
2023-09-15 20:51 ` Rahul Rameshbabu
2023-09-17 20:37 ` Christophe JAILLET
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=443aef6a6d90011e8fffcd43e1a88cd9e98594ca.1693070958.git.christophe.jaillet@wanadoo.fr \
--to=christophe.jaillet@wanadoo.fr \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rrameshbabu@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).