diff mbox

DVB-USB: correct the comment about KEY_SLEEP

Message ID 1236164977.3936.30.camel@hughsie-work.lan (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Richard Hughes March 4, 2009, 11:09 a.m. UTC 
On Wed, 2009-03-04 at 10:54 +0000, Richard Hughes wrote:
> On Mon, 2009-03-02 at 08:24 -0300, Henrique de Moraes Holschuh wrote:
> > FWIW, I think it is a good idea, and I'd take patches for
> > thinkpad-acpi.
> 
> Patch attached for thinkpad-acpi. KEY_HIBERNATE is already in
> linux-next, but has not yet been pushed to master. Please review,
> thanks.

Antti, I've included a fix to the Afatech AF9015 DVB-T USB2.0 receiver
header file. It corrects the comment about KEY_SLEEP. Please review.

Thanks,

Richard.

Comments

Antti Palosaari March 10, 2009, 10:31 a.m. UTC | #1 
Richard Hughes wrote:
> On Wed, 2009-03-04 at 10:54 +0000, Richard Hughes wrote:
>> On Mon, 2009-03-02 at 08:24 -0300, Henrique de Moraes Holschuh wrote:
>>> FWIW, I think it is a good idea, and I'd take patches for
>>> thinkpad-acpi.
>> Patch attached for thinkpad-acpi. KEY_HIBERNATE is already in
>> linux-next, but has not yet been pushed to master. Please review,
>> thanks.
> 
> Antti, I've included a fix to the Afatech AF9015 DVB-T USB2.0 receiver
> header file. It corrects the comment about KEY_SLEEP. Please review.

It is not correct. Comment "Hibernate" for that button comes from the 
remote controller, where "Z^z" is printed to the top of the button and 
"Hibernate" below the button. Replacing KEY_SLEEP with KEY_HIBERNATE 
seems to be correct solution for me.

regards
Antti
diff mbox

Patch

From 839a18f6663f416b484d496824beb7ad9cfe9215 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Wed, 4 Mar 2009 11:01:31 +0000
Subject: DVB-USB: correct the comment about KEY_SLEEP

KEY_HIBERNATE is used when the decal on the key indicates sleep to disk,
KEY_SUSPEND is used when the decal indicates sleep to memory, and
KEY_SLEEP is used when the sleep type is unknown or unspecified

We've already converted Xorg, HAL, and most of userspace to use the same names.

With this patch, the sleep keys can be labeled consistently all the way
through the stack. More patches to other device drivers are to follow.

Signed-off-by: Richard Hughes <hughsient@gmail.com>
---
 drivers/media/dvb/dvb-usb/af9015.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/dvb/dvb-usb/af9015.h
index 21c7782..e01587c 100644
--- a/drivers/media/dvb/dvb-usb/af9015.h
+++ b/drivers/media/dvb/dvb-usb/af9015.h
@@ -244,7 +244,7 @@  static struct dvb_usb_rc_key af9015_rc_keys_twinhan[] = {
 	{ 0x01, 0x17, KEY_SUBTITLE },     /* Subtitle / CC */
 	{ 0x00, 0x10, KEY_MUTE },
 	{ 0x01, 0x19, KEY_AUDIO },        /* L/R */ /* TODO better event */
-	{ 0x01, 0x16, KEY_SLEEP },        /* Hibernate */
+	{ 0x01, 0x16, KEY_SLEEP },        /* Sleep */
 	{ 0x01, 0x16, KEY_SWITCHVIDEOMODE },
 					  /* A/V */ /* TODO does not work */
 	{ 0x00, 0x06, KEY_AGAIN },        /* Recall */
-- 
1.6.1.3