* [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier
@ 2012-09-13 1:38 Axel Lin
2012-09-13 1:39 ` [PATCH 2/2] HID: hid-sensor-hub: Fix sensor_hub_probe error handling Axel Lin
2012-09-13 13:25 ` [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier Axel Lin
0 siblings, 2 replies; 6+ messages in thread
From: Axel Lin @ 2012-09-13 1:38 UTC (permalink / raw)
To: Jiri Kosina
Cc: srinivas pandruvada, Jonathan Cameron, linux-input, linux-kernel
Clear HID_CLAIMED_INPUT bit of hdev->claimed, this prevents calling
hidinput_disconnect() in hid_disconnect(), which is called by hid_hw_stop().
We need to clear HID_CLAIMED_INPUT bit earlier rather than in
sensor_hub_remove() because we also call hid_hw_stop() in sensor_hub_probe
error handling.
Also adds comments for why we set hdev->claimed = HID_CLAIMED_INPUT.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
Hi srinivas,
I don't have this hardware, I'd appreciate if you can test these patches.
Axel
drivers/hid/hid-sensor-hub.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 4ac759c..50bc8c7 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -539,8 +539,11 @@ static int sensor_hub_probe(struct hid_device *hdev,
}
INIT_LIST_HEAD(&hdev->inputs);
+ /* We don't use hidinput but hid_hw_start() fails if nothing is
+ * claimed. So spoof claimed input. */
hdev->claimed = HID_CLAIMED_INPUT;
ret = hid_hw_start(hdev, 0);
+ hdev->claimed &= ~HID_CLAIMED_INPUT;
if (ret) {
hid_err(hdev, "hw start failed\n");
goto err_free;
@@ -627,7 +630,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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] HID: hid-sensor-hub: Fix sensor_hub_probe error handling
2012-09-13 1:38 [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier Axel Lin
@ 2012-09-13 1:39 ` Axel Lin
2012-09-13 18:24 ` Pandruvada, Srinivas
2012-09-13 13:25 ` [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier Axel Lin
1 sibling, 1 reply; 6+ messages in thread
From: Axel Lin @ 2012-09-13 1:39 UTC (permalink / raw)
To: Jiri Kosina
Cc: srinivas pandruvada, Jonathan Cameron, linux-input, linux-kernel
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 <axel.lin@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH 2/2] HID: hid-sensor-hub: Fix sensor_hub_probe error handling
2012-09-13 1:39 ` [PATCH 2/2] HID: hid-sensor-hub: Fix sensor_hub_probe error handling Axel Lin
@ 2012-09-13 18:24 ` Pandruvada, Srinivas
0 siblings, 0 replies; 6+ messages in thread
From: Pandruvada, Srinivas @ 2012-09-13 18:24 UTC (permalink / raw)
To: Axel Lin, Jiri Kosina; +Cc: Jonathan Cameron, linux-input, linux-kernel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1718 bytes --]
Agreed. It works.
Thanks,
Srinivas
-----Original Message-----
From: Axel Lin [mailto:axel.lin@gmail.com]
Sent: Wednesday, September 12, 2012 6:40 PM
To: Jiri Kosina
Cc: Pandruvada, Srinivas; Jonathan Cameron; linux-input@vger.kernel.org; linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] HID: hid-sensor-hub: Fix sensor_hub_probe error handling
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 <axel.lin@gmail.com>
---
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
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier
2012-09-13 1:38 [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier Axel Lin
2012-09-13 1:39 ` [PATCH 2/2] HID: hid-sensor-hub: Fix sensor_hub_probe error handling Axel Lin
@ 2012-09-13 13:25 ` Axel Lin
2012-09-13 18:24 ` Pandruvada, Srinivas
1 sibling, 1 reply; 6+ messages in thread
From: Axel Lin @ 2012-09-13 13:25 UTC (permalink / raw)
To: Jiri Kosina
Cc: srinivas pandruvada, Jonathan Cameron, linux-input, linux-kernel
2012/9/13 Axel Lin <axel.lin@gmail.com>:
> Clear HID_CLAIMED_INPUT bit of hdev->claimed, this prevents calling
> hidinput_disconnect() in hid_disconnect(), which is called by hid_hw_stop().
>
> We need to clear HID_CLAIMED_INPUT bit earlier rather than in
> sensor_hub_remove() because we also call hid_hw_stop() in sensor_hub_probe
> error handling.
>
> Also adds comments for why we set hdev->claimed = HID_CLAIMED_INPUT.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> Hi srinivas,
> I don't have this hardware, I'd appreciate if you can test these patches.
> Axel
>
> drivers/hid/hid-sensor-hub.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
> index 4ac759c..50bc8c7 100644
> --- a/drivers/hid/hid-sensor-hub.c
> +++ b/drivers/hid/hid-sensor-hub.c
> @@ -539,8 +539,11 @@ static int sensor_hub_probe(struct hid_device *hdev,
> }
> INIT_LIST_HEAD(&hdev->inputs);
>
> + /* We don't use hidinput but hid_hw_start() fails if nothing is
> + * claimed. So spoof claimed input. */
> hdev->claimed = HID_CLAIMED_INPUT;
> ret = hid_hw_start(hdev, 0);
I check the implementation of hid_hw_start again, it looks
hid_hw_start allows connect_mask to be 0.
So we don't need setting "hdev->claimed = HID_CLAIMED_INPUT;" here.
Comments?
Axel
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier
2012-09-13 13:25 ` [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier Axel Lin
@ 2012-09-13 18:24 ` Pandruvada, Srinivas
2012-09-13 22:01 ` Axel Lin
0 siblings, 1 reply; 6+ messages in thread
From: Pandruvada, Srinivas @ 2012-09-13 18:24 UTC (permalink / raw)
To: axel.lin, Jiri Kosina; +Cc: Jonathan Cameron, linux-input, linux-kernel
Hi Axel,
We don't need this anymore as when connect_mask is 0, the hid_connect will not be called.
So we don't need hdev->claimed = HID_CLAIMED_INPUT anymore.
Thanks for the review.
-Srinivas
-----Original Message-----
From: Axel Lin [mailto:axel.lin@gmail.com]
Sent: Thursday, September 13, 2012 6:25 AM
To: Jiri Kosina
Cc: Pandruvada, Srinivas; Jonathan Cameron; linux-input@vger.kernel.org; linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier
2012/9/13 Axel Lin <axel.lin@gmail.com>:
> Clear HID_CLAIMED_INPUT bit of hdev->claimed, this prevents calling
> hidinput_disconnect() in hid_disconnect(), which is called by hid_hw_stop().
>
> We need to clear HID_CLAIMED_INPUT bit earlier rather than in
> sensor_hub_remove() because we also call hid_hw_stop() in
> sensor_hub_probe error handling.
>
> Also adds comments for why we set hdev->claimed = HID_CLAIMED_INPUT.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> Hi srinivas,
> I don't have this hardware, I'd appreciate if you can test these patches.
> Axel
>
> drivers/hid/hid-sensor-hub.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hid/hid-sensor-hub.c
> b/drivers/hid/hid-sensor-hub.c index 4ac759c..50bc8c7 100644
> --- a/drivers/hid/hid-sensor-hub.c
> +++ b/drivers/hid/hid-sensor-hub.c
> @@ -539,8 +539,11 @@ static int sensor_hub_probe(struct hid_device *hdev,
> }
> INIT_LIST_HEAD(&hdev->inputs);
>
> + /* We don't use hidinput but hid_hw_start() fails if nothing is
> + * claimed. So spoof claimed input. */
> hdev->claimed = HID_CLAIMED_INPUT;
> ret = hid_hw_start(hdev, 0);
I check the implementation of hid_hw_start again, it looks hid_hw_start allows connect_mask to be 0.
So we don't need setting "hdev->claimed = HID_CLAIMED_INPUT;" here.
Comments?
Axel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier
2012-09-13 18:24 ` Pandruvada, Srinivas
@ 2012-09-13 22:01 ` Axel Lin
0 siblings, 0 replies; 6+ messages in thread
From: Axel Lin @ 2012-09-13 22:01 UTC (permalink / raw)
To: Pandruvada, Srinivas
Cc: Jiri Kosina, Jonathan Cameron, linux-input, linux-kernel
2012/9/14 Pandruvada, Srinivas <srinivas.pandruvada@intel.com>:
> Hi Axel,
>
> We don't need this anymore as when connect_mask is 0, the hid_connect will not be called.
> So we don't need hdev->claimed = HID_CLAIMED_INPUT anymore.
>
Okay. I'm going to resend the patch for this serial.
Axel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-13 22:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-13 1:38 [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier Axel Lin
2012-09-13 1:39 ` [PATCH 2/2] HID: hid-sensor-hub: Fix sensor_hub_probe error handling Axel Lin
2012-09-13 18:24 ` Pandruvada, Srinivas
2012-09-13 13:25 ` [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier Axel Lin
2012-09-13 18:24 ` Pandruvada, Srinivas
2012-09-13 22:01 ` Axel Lin
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).