From patchwork Wed Mar 4 11:09:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Hughes X-Patchwork-Id: 9839 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n24BAYda022786 for ; Wed, 4 Mar 2009 11:10:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752796AbZCDLKe (ORCPT ); Wed, 4 Mar 2009 06:10:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752696AbZCDLKe (ORCPT ); Wed, 4 Mar 2009 06:10:34 -0500 Received: from an-out-0708.google.com ([209.85.132.248]:24248 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750768AbZCDLKc (ORCPT ); Wed, 4 Mar 2009 06:10:32 -0500 Received: by an-out-0708.google.com with SMTP id c2so2351303anc.1 for ; Wed, 04 Mar 2009 03:10:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer; bh=P1pbMBTzosI1F4zIRKjWN5lubl6w00qm1eY0YYSfMw8=; b=k2W7gEpVkCkUo4Tk3cFAqAX3NoA25futhSmYDggy5TRjP+mXl38ODrE/GXR6UnkwGq fWy8q83YCy/aZtPwG0z7c5UhhNYZ1IQz4e+yJvN3hWGNHCfRSiIPM3dfGCXvllEbR9y7 MMp6qapdbJOUSG8TMlMWHFVjV+PluZIfGGD1I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer; b=xuyFgKNoEkn+WIfPSFVk89beJAxzHB7SAMW4r8REwzHyXPdJbYcXYdxCoqPwA7DTiY IpP05XDXmMz6W3yHULuqelGv3GCD2B5k4d+ZGDVIuAc+j2i4vMiPh5eSX+mUiL8c9q2H lsBCp5HX+v/5nUiIkOnKu+h06V8W7HAmUlf5M= Received: by 10.100.105.15 with SMTP id d15mr6410897anc.141.1236165030202; Wed, 04 Mar 2009 03:10:30 -0800 (PST) Received: from ?192.168.1.64? ([78.86.247.183]) by mx.google.com with ESMTPS id d12sm863598and.4.2009.03.04.03.10.27 (version=SSLv3 cipher=RC4-MD5); Wed, 04 Mar 2009 03:10:29 -0800 (PST) Subject: Re: [PATCH] DVB-USB: correct the comment about KEY_SLEEP From: Richard Hughes To: Antti Palosaari Cc: linux-acpi , Peter Hutterer , mjg , linux-input , Matthias Clasen In-Reply-To: <1236164049.3936.17.camel@hughsie-work.lan> References: <1235992429.3858.58.camel@hughsie-work.lan> <20090302112400.GA2356@khazad-dum.debian.net> <1236164049.3936.17.camel@hughsie-work.lan> Date: Wed, 04 Mar 2009 11:09:37 +0000 Message-Id: <1236164977.3936.30.camel@hughsie-work.lan> Mime-Version: 1.0 X-Mailer: Evolution 2.25.91 (2.25.91-3.fc11) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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. From 839a18f6663f416b484d496824beb7ad9cfe9215 Mon Sep 17 00:00:00 2001 From: Richard Hughes 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 --- 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