Re: [PATCH 4/6] usbhid: enable remote wakeup for keyboards

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 2 Apr 2010, Alan Stern wrote:

> This patch (as1365) enables remote wakeup by default for USB keyboard
> devices.  Keyboards in general are supposed to be wakeup devices, but
> the correct place to enable it depends on the device's bus; no single
> approach will work for all keyboard devices.  In particular, this
> covers only USB keyboards (and then only those supporting the boot
> protocol).
> 
> Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> 
> ---
> 
> This patch is necessary in view of the preceding patch (3/6) in this 
> series, which disables remote wakeup by default for all USB devices.
> 
> 
> 
> Index: usb-2.6/drivers/hid/usbhid/hid-core.c
> ===================================================================
> --- usb-2.6.orig/drivers/hid/usbhid/hid-core.c
> +++ usb-2.6/drivers/hid/usbhid/hid-core.c
> @@ -1024,12 +1024,15 @@ static int usbhid_start(struct hid_devic
>  	/* Some keyboards don't work until their LEDs have been set.
>  	 * Since BIOSes do set the LEDs, it must be safe for any device
>  	 * that supports the keyboard boot protocol.
> +	 * In addition, enable remote wakeup by default for all keyboard
> +	 * devices supporting the boot protocol.
>  	 */
>  	if (interface->desc.bInterfaceSubClass == USB_INTERFACE_SUBCLASS_BOOT &&
>  			interface->desc.bInterfaceProtocol ==
> -				USB_INTERFACE_PROTOCOL_KEYBOARD)
> +				USB_INTERFACE_PROTOCOL_KEYBOARD) {
>  		usbhid_set_leds(hid);
> -
> +		device_set_wakeup_enable(&dev->dev, 1);
> +	}
>  	return 0;
>  
>  fail:
> Index: usb-2.6/drivers/hid/usbhid/usbkbd.c
> ===================================================================
> --- usb-2.6.orig/drivers/hid/usbhid/usbkbd.c
> +++ usb-2.6/drivers/hid/usbhid/usbkbd.c
> @@ -311,6 +311,7 @@ static int usb_kbd_probe(struct usb_inte
>  		goto fail2;
>  
>  	usb_set_intfdata(iface, kbd);
> +	device_set_wakeup_enable(&dev->dev, 1);
>  	return 0;
>  
>  fail2:	

I have queued it for next merge window, thanks a lot Alan.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
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

[Index of Archives]     [Linux Media Devel]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Linux Wireless Networking]     [Linux Omap]

  Powered by Linux