| Message ID | 1347574536.8974.8.camel@phoenix (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
On Fri, 14 September 2012 Axel Lin <axel.lin@gmail.com> 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> Acked-By: Bruno Prémont <bonbons@linux-vserver.org> This same change was applied to 3.6 but got lost while applying my patches on 3.6rc. I will what else (of 3.5 -> 3.6 changes) might have been lost while applying driver code split. Thanks for spotting. Bruno > --- > drivers/hid/hid-picolcd_core.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c > index 8c9ec1f..e30e703 100644 > --- a/drivers/hid/hid-picolcd_core.c > +++ b/drivers/hid/hid-picolcd_core.c > @@ -583,11 +583,7 @@ static int picolcd_probe(struct hid_device *hdev, > goto err_cleanup_data; > } > > - /* We don't use hidinput but hid_hw_start() fails if nothing is > - * claimed. So spoof claimed input. */ > - hdev->claimed = HID_CLAIMED_INPUT; > error = hid_hw_start(hdev, 0); > - hdev->claimed = 0; > if (error) { > hid_err(hdev, "hardware start failed\n"); > goto err_cleanup_data; -- 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-picolcd_core.c b/drivers/hid/hid-picolcd_core.c index 8c9ec1f..e30e703 100644 --- a/drivers/hid/hid-picolcd_core.c +++ b/drivers/hid/hid-picolcd_core.c @@ -583,11 +583,7 @@ static int picolcd_probe(struct hid_device *hdev, goto err_cleanup_data; } - /* We don't use hidinput but hid_hw_start() fails if nothing is - * claimed. So spoof claimed input. */ - hdev->claimed = HID_CLAIMED_INPUT; error = hid_hw_start(hdev, 0); - hdev->claimed = 0; if (error) { hid_err(hdev, "hardware start failed\n"); goto err_cleanup_data;
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-picolcd_core.c | 4 ---- 1 file changed, 4 deletions(-)