[PATCH 2/2] HID: hid-sensor-hub: Fix sensor_hub_probe error handling
flat view
STALE5141d
From: Axel Lin <hidden>
Date: 2012-09-13 01:39:55
Also in:
lkml
Subsystem:
hid core layer, hid sensor hub drivers, the rest · Maintainers:
Jiri Kosina, Benjamin Tissoires, Jonathan Cameron, Srinivas Pandruvada, Linus Torvalds
Fix below issues in sensor_hub_probe error handling: 1. In the case of goto err_close, hid_hw_stop(hdev) is called twice. Fix it. 2. If fails to allocate MFD device name, we also need to free all successfully allocated names in previous iterations. Signed-off-by: Axel Lin <redacted> --- drivers/hid/hid-sensor-hub.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 50bc8c7..8bd7620 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c@@ -584,7 +584,7 @@ static int sensor_hub_probe(struct hid_device *hdev, hid_err(hdev, "Failed MFD device name\n"); ret = -ENOMEM; - goto err_free_cells; + goto err_free_names; } sd->hid_sensor_hub_client_devs[ sd->hid_sensor_client_cnt].name = name;
@@ -608,10 +608,8 @@ static int sensor_hub_probe(struct hid_device *hdev, err_free_names: for (i = 0; i < sd->hid_sensor_client_cnt ; ++i) kfree(sd->hid_sensor_hub_client_devs[i].name); -err_free_cells: kfree(sd->hid_sensor_hub_client_devs); err_close: - hid_hw_stop(hdev); hid_hw_close(hdev); err_stop_hw: hid_hw_stop(hdev);
--
1.7.9.5