* [PATCH v2 2/2] HID: hid-sensor-hub: Fix sensor_hub_probe error handling
2012-09-18 0:52 [PATCH RESEND 1/2] HID: hid-sensor-hub: Remove setting hdev->claimed before calling hid_hw_start() Axel Lin
@ 2012-09-18 0:53 ` Axel Lin
2012-09-19 11:46 ` [PATCH RESEND 1/2] HID: hid-sensor-hub: Remove setting hdev->claimed before calling hid_hw_start() Jiri Kosina
1 sibling, 0 replies; 4+ messages in thread
From: Axel Lin @ 2012-09-18 0:53 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: Jiri Kosina, Srinivas Pandruvada, linux-input
Fix below issues:
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.
3. In sensor_hub_remove(), Call hid_hw_close() before hid_hw_stop().
4. Adjust unnecessary change lines for hid_err.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
---
drivers/hid/hid-sensor-hub.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 1faacf2..b9ce38e 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -564,8 +564,7 @@ static int sensor_hub_probe(struct hid_device *hdev,
sizeof(struct mfd_cell),
GFP_KERNEL);
if (sd->hid_sensor_hub_client_devs == NULL) {
- hid_err(hdev,
- "Failed to allocate memory for mfd cells\n");
+ hid_err(hdev, "Failed to allocate memory for mfd cells\n");
ret = -ENOMEM;
goto err_close;
}
@@ -577,10 +576,9 @@ static int sensor_hub_probe(struct hid_device *hdev,
name = kasprintf(GFP_KERNEL, "HID-SENSOR-%x",
field->physical);
if (name == NULL) {
- hid_err(hdev,
- "Failed MFD device name\n");
+ 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;
@@ -604,10 +602,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);
@@ -626,8 +622,8 @@ static void sensor_hub_remove(struct hid_device *hdev)
int i;
hid_dbg(hdev, " hardware removed\n");
- hid_hw_stop(hdev);
hid_hw_close(hdev);
+ hid_hw_stop(hdev);
spin_lock_irqsave(&data->lock, flags);
if (data->pending.status)
complete(&data->pending.ready);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH RESEND 1/2] HID: hid-sensor-hub: Remove setting hdev->claimed before calling hid_hw_start()
2012-09-18 0:52 [PATCH RESEND 1/2] HID: hid-sensor-hub: Remove setting hdev->claimed before calling hid_hw_start() Axel Lin
2012-09-18 0:53 ` [PATCH v2 2/2] HID: hid-sensor-hub: Fix sensor_hub_probe error handling Axel Lin
@ 2012-09-19 11:46 ` Jiri Kosina
2012-09-19 15:32 ` Pandruvada, Srinivas
1 sibling, 1 reply; 4+ messages in thread
From: Jiri Kosina @ 2012-09-19 11:46 UTC (permalink / raw)
To: Axel Lin; +Cc: Jonathan Cameron, Srinivas Pandruvada, linux-input
On Tue, 18 Sep 2012, Axel Lin wrote:
> Current implementation of hid_hw_start() allows connect_mask to be 0.
> Setting hdev->claimed = HID_CLAIMED_INPUT before calling hid_hw_start() is not
> necessary. Remove it.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Jonathan, please take it on top of the other changes.
Thanks.
> ---
> drivers/hid/hid-sensor-hub.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
> index 4ac759c..1faacf2 100644
> --- a/drivers/hid/hid-sensor-hub.c
> +++ b/drivers/hid/hid-sensor-hub.c
> @@ -539,7 +539,6 @@ static int sensor_hub_probe(struct hid_device *hdev,
> }
> INIT_LIST_HEAD(&hdev->inputs);
>
> - hdev->claimed = HID_CLAIMED_INPUT;
> ret = hid_hw_start(hdev, 0);
> if (ret) {
> hid_err(hdev, "hw start failed\n");
> @@ -627,7 +626,6 @@ static void sensor_hub_remove(struct hid_device *hdev)
> int i;
>
> hid_dbg(hdev, " hardware removed\n");
> - hdev->claimed &= ~HID_CLAIMED_INPUT;
> hid_hw_stop(hdev);
> hid_hw_close(hdev);
> spin_lock_irqsave(&data->lock, flags);
> --
> 1.7.9.5
>
>
>
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread