| Message ID | 1347500288.7434.1.camel@phoenix (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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(-)