[SRU][O/P][PATCH 24/27] HID: intel-thc-hid: intel-thc: Fix error code in thc_i2c_subip_init()

Aaron Ma aaron.ma at canonical.com
Fri Jan 24 10:41:20 UTC 2025


From: Dan Carpenter <dan.carpenter at linaro.org>

BugLink: https://bugs.launchpad.net/bugs/2096624

Return -ENOMEM if the allocation fails.  Don't return success.

Fixes: 4228966def88 ("HID: intel-thc-hid: intel-thc: Add THC I2C config interfaces")
Signed-off-by: Dan Carpenter <dan.carpenter at linaro.org>
Link: https://patch.msgid.link/eb4ea363-c3b7-4988-9ff5-5ed74bf47620@stanley.mountain
Signed-off-by: Benjamin Tissoires <bentiss at kernel.org>
(cherry picked from commit 0b0d62fa73f22884e1ddd4ed6e288f959ad116ae)
Signed-off-by: Aaron Ma <aaron.ma at canonical.com>
---
 drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c
index fea34745b773..235ddea48ae7 100644
--- a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c
+++ b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c
@@ -1519,7 +1519,7 @@ int thc_i2c_subip_init(struct thc_device *dev, const u32 target_address,
 
 	dev->i2c_subip_regs = devm_kzalloc(dev->dev, sizeof(i2c_subip_regs), GFP_KERNEL);
 	if (!dev->i2c_subip_regs)
-		return PTR_ERR(dev->i2c_subip_regs);
+		return -ENOMEM;
 
 	return 0;
 }
-- 
2.43.0




More information about the kernel-team mailing list