On Mon, 8 Feb 2010, Bruno [UTF-8] Prémont wrote:
> On Mon, 08 February 2010 Bruno Prémont <bonbons@xxxxxxxxxxxxxxxxx> wrote:
> > 2.6.33-rc7 (don't know if any previous version resumes properly)
> > crashes during resume from S2Ram when my USB keyboard is connected but
> > resumes properly (viafb corruption put apart) when the USB keyboard is
> > not connected.
>
> The patch below works around the crash though the WARN_ON() in
> usbhid_restart_out_queue() triggers in place.
>
> Bruno
>
> diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
> index e2997a8..d2f8eef 100644
> --- a/drivers/hid/usbhid/hid-core.c
> +++ b/drivers/hid/usbhid/hid-core.c
> @@ -196,7 +196,7 @@ static void usbhid_mark_busy(struct usbhid_device *usbhid)
>
> static int usbhid_restart_out_queue(struct usbhid_device *usbhid)
> {
> - struct hid_device *hid = usb_get_intfdata(usbhid->intf);
> + struct hid_device *hid = usbhid->intf ? usb_get_intfdata(usbhid->intf) : NULL;
> int kicked;
>
> if (!hid)
> @@ -214,7 +214,7 @@ static int usbhid_restart_out_queue(struct usbhid_device *usbhid)
>
> static int usbhid_restart_ctrl_queue(struct usbhid_device *usbhid)
> {
> - struct hid_device *hid = usb_get_intfdata(usbhid->intf);
> + struct hid_device *hid = usbhid->intf ? usb_get_intfdata(usbhid->intf) : NULL;
> int kicked;
>
> WARN_ON(hid == NULL);
Clearly something is setting usbhid->intf to NULL. But I don't see any
code that would do it. You may have to resort to putting printk()
statements at various strategic places to find out where it happens.
You could start with the beginnings and ends of hid_suspend,
hid_resume, and hid_reset_resume. Maybe also usbhid_disconnect(), just
in case.
Alan Stern
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
