lkml.org 
[lkml]   [2011]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] HID: usbhid: fix suspend timeout due to RUNNING bits
From
Ping. Would someone in linux-usb take a look at this fix?

Thanks,
Benson

On Fri, Sep 2, 2011 at 5:07 PM, Benson Leung <bleung@chromium.org> wrote:
> hid_submit_ctrl and hid_submit_out should return error
> codes when HID_REPORTED_IDLE is set by hid_suspend.
> This will allow the output and control completion
> handlers to clear HID_OUT_RUNNING and HID_CTRL_RUNNING
> so hid_suspend succeeds.
>
> Previously, if there were outstanding out messages
> or control messages while hid_suspend was called,
> hid_suspend would fail because usbhid_wait_io would time
> out.
>
> This condition happens with USB keyboards with both capslock and
> numlock leds enabled at suspend time. Control requests
> will come down to the hid-core to disable both leds, with
> hid_suspend being called between the two being submitted.
>
> Signed-off-by: Benson Leung <bleung@chromium.org>
> ---
>  drivers/hid/usbhid/hid-core.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
> index a9fa294..cf5c106 100644
> --- a/drivers/hid/usbhid/hid-core.c
> +++ b/drivers/hid/usbhid/hid-core.c
> @@ -326,6 +326,8 @@ static int hid_submit_out(struct hid_device *hid)
>                        return -1;
>                }
>                usbhid->last_out = jiffies;
> +       } else {
> +               return -1;
>        }
>
>        return 0;
> @@ -385,6 +387,8 @@ static int hid_submit_ctrl(struct hid_device *hid)
>                        return -1;
>                }
>                usbhid->last_ctrl = jiffies;
> +       } else {
> +               return -1;
>        }
>
>        return 0;
> --
> 1.7.1
>
>



--
Benson Leung
Software Engineer, Chrom* OS
bleung@chromium.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2011-09-13 03:35    [W:0.042 / U:0.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site