* [PATCH 1/3] HID: hid-sensor-hub: Remove setting hdev->claimed before calling hid_hw_start()
@ 2012-09-13 22:03 Axel Lin
2012-09-13 22:05 ` [PATCH 2/3] HID: hid-sensor-hub: Fix sensor_hub_probe error handling Axel Lin
2012-09-13 22:06 ` [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop() Axel Lin
0 siblings, 2 replies; 6+ messages in thread
From: Axel Lin @ 2012-09-13 22:03 UTC (permalink / raw)
To: Jiri Kosina; +Cc: srinivas pandruvada, Jonathan Cameron, linux-input
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>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] HID: hid-sensor-hub: Fix sensor_hub_probe error handling
2012-09-13 22:03 [PATCH 1/3] HID: hid-sensor-hub: Remove setting hdev->claimed before calling hid_hw_start() Axel Lin
@ 2012-09-13 22:05 ` Axel Lin
2012-09-13 22:06 ` [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop() Axel Lin
1 sibling, 0 replies; 6+ messages in thread
From: Axel Lin @ 2012-09-13 22:05 UTC (permalink / raw)
To: Jiri Kosina; +Cc: srinivas pandruvada, Jonathan Cameron, linux-input
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
sucessfully 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 1faacf2..f9d6209 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -580,7 +580,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;
@@ -604,10 +604,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
* [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop()
2012-09-13 22:03 [PATCH 1/3] HID: hid-sensor-hub: Remove setting hdev->claimed before calling hid_hw_start() Axel Lin
2012-09-13 22:05 ` [PATCH 2/3] HID: hid-sensor-hub: Fix sensor_hub_probe error handling Axel Lin
@ 2012-09-13 22:06 ` Axel Lin
2012-09-13 22:31 ` Pandruvada, Srinivas
1 sibling, 1 reply; 6+ messages in thread
From: Axel Lin @ 2012-09-13 22:06 UTC (permalink / raw)
To: Jiri Kosina; +Cc: srinivas pandruvada, Jonathan Cameron, linux-input
Also adjust unnecessary change lines for hid_err.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/hid/hid-sensor-hub.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index f9d6209..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,8 +576,7 @@ 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_names;
}
@@ -624,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] 6+ messages in thread
* RE: [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop()
2012-09-13 22:06 ` [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop() Axel Lin
@ 2012-09-13 22:31 ` Pandruvada, Srinivas
2012-09-17 10:58 ` Jiri Kosina
0 siblings, 1 reply; 6+ messages in thread
From: Pandruvada, Srinivas @ 2012-09-13 22:31 UTC (permalink / raw)
To: Axel Lin, Jiri Kosina; +Cc: Jonathan Cameron, linux-input@vger.kernel.org
I think you can merge this patch with your patch 2/3 as both are addressing hid_hw_close and hid_hw_stop.
Thanks,
Srinivas
-----Original Message-----
From: Axel Lin [mailto:axel.lin@gmail.com]
Sent: Thursday, September 13, 2012 3:07 PM
To: Jiri Kosina
Cc: Pandruvada, Srinivas; Jonathan Cameron; linux-input@vger.kernel.org
Subject: [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop()
Also adjust unnecessary change lines for hid_err.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/hid/hid-sensor-hub.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index f9d6209..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,8 +576,7 @@ 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_names;
}
@@ -624,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 [flat|nested] 6+ messages in thread
* RE: [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop()
2012-09-13 22:31 ` Pandruvada, Srinivas
@ 2012-09-17 10:58 ` Jiri Kosina
2012-09-17 15:20 ` Pandruvada, Srinivas
0 siblings, 1 reply; 6+ messages in thread
From: Jiri Kosina @ 2012-09-17 10:58 UTC (permalink / raw)
To: Pandruvada, Srinivas
Cc: Axel Lin, Jonathan Cameron, linux-input@vger.kernel.org
On Thu, 13 Sep 2012, Pandruvada, Srinivas wrote:
> I think you can merge this patch with your patch 2/3 as both are
> addressing hid_hw_close and hid_hw_stop.
Agreed. In addition to that, I am fine with the changes. As this whole lot
is going through Jonathan to Greg, I just add my
Acked-by: Jiri Kosina <jkosina@suse.cz>
and let Jonathan take it. Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop()
2012-09-17 10:58 ` Jiri Kosina
@ 2012-09-17 15:20 ` Pandruvada, Srinivas
0 siblings, 0 replies; 6+ messages in thread
From: Pandruvada, Srinivas @ 2012-09-17 15:20 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Axel Lin, Jonathan Cameron, linux-input@vger.kernel.org
Hi Alex,
Can you resubmit your patches merging 2/3 and 3/3?
Thanks,
Srinivas
-----Original Message-----
From: Jiri Kosina [mailto:jkosina@suse.cz]
Sent: Monday, September 17, 2012 3:58 AM
To: Pandruvada, Srinivas
Cc: Axel Lin; Jonathan Cameron; linux-input@vger.kernel.org
Subject: RE: [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop()
On Thu, 13 Sep 2012, Pandruvada, Srinivas wrote:
> I think you can merge this patch with your patch 2/3 as both are
> addressing hid_hw_close and hid_hw_stop.
Agreed. In addition to that, I am fine with the changes. As this whole lot is going through Jonathan to Greg, I just add my
Acked-by: Jiri Kosina <jkosina@suse.cz>
and let Jonathan take it. Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-17 15:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-13 22:03 [PATCH 1/3] HID: hid-sensor-hub: Remove setting hdev->claimed before calling hid_hw_start() Axel Lin
2012-09-13 22:05 ` [PATCH 2/3] HID: hid-sensor-hub: Fix sensor_hub_probe error handling Axel Lin
2012-09-13 22:06 ` [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop() Axel Lin
2012-09-13 22:31 ` Pandruvada, Srinivas
2012-09-17 10:58 ` Jiri Kosina
2012-09-17 15:20 ` Pandruvada, Srinivas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox