From patchwork Sat Feb 6 15:30:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrique de Moraes Holschuh X-Patchwork-Id: 77524 X-Patchwork-Delegate: lenb@kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o16FUeRR013352 for ; Sat, 6 Feb 2010 15:30:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753286Ab0BFPai (ORCPT ); Sat, 6 Feb 2010 10:30:38 -0500 Received: from out2.smtp.messagingengine.com ([66.111.4.26]:39998 "EHLO out2.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752880Ab0BFPah (ORCPT ); Sat, 6 Feb 2010 10:30:37 -0500 Received: from compute1.internal (compute1.internal [10.202.2.41]) by gateway1.messagingengine.com (Postfix) with ESMTP id B42DCDEA39; Sat, 6 Feb 2010 10:30:36 -0500 (EST) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute1.internal (MEProxy); Sat, 06 Feb 2010 10:30:36 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; s=smtpout; bh=tZWLj8mIS28OR4buEYd7Es7Jb5k=; b=Is4Hnp39vons9VjP6QYU7xessGhtYU61cVZ2xnHBmGkRib4xDcPWedJYNtySJQ3k4cMv4ND581lZ2bzT8iY5loUrpFar0uPdlUaNUQ+rv4grLfjqmIqn1JxUxeAUF+fv9wwTM6q9TK7p61twssrx9TFEDjRlQ6JArl1bce81Dxo= X-Sasl-enc: GUKkC7xS1FKZV76tIM6xgHyZkui/HPvA6uypsRm+oahv 1265470236 Received: from khazad-dum.debian.net (unknown [201.82.165.62]) by mail.messagingengine.com (Postfix) with ESMTPSA id 581AF1F850; Sat, 6 Feb 2010 10:30:36 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by localhost.khazad-dum.debian.net (Postfix) with ESMTP id D40D72824A; Sat, 6 Feb 2010 13:30:34 -0200 (BRST) X-Virus-Scanned: Debian amavisd-new at khazad-dum.debian.net Received: from khazad-dum.debian.net ([127.0.0.1]) by localhost (khazad-dum.debian.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id XqL7Y1Hfa4By; Sat, 6 Feb 2010 13:30:33 -0200 (BRST) Received: by khazad-dum.debian.net (Postfix, from userid 1000) id E5CD028244; Sat, 6 Feb 2010 13:30:33 -0200 (BRST) From: Henrique de Moraes Holschuh To: Len Brown Cc: linux-acpi@vger.kernel.org, ibm-acpi-devel@lists.sourceforge.net, Henrique de Moraes Holschuh Subject: [PATCH 1/4] thinkpad-acpi: document HKEY event 3006 Date: Sat, 6 Feb 2010 13:30:27 -0200 Message-Id: <1265470230-30797-2-git-send-email-hmh@hmh.eng.br> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1265470230-30797-1-git-send-email-hmh@hmh.eng.br> References: <1265470230-30797-1-git-send-email-hmh@hmh.eng.br> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 06 Feb 2010 15:30:42 +0000 (UTC) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index e67e4fe..a923132 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -3655,13 +3655,19 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) break; case 3: /* 0x3000-0x3FFF: bay-related wakeups */ - if (hkey == TP_HKEY_EV_BAYEJ_ACK) { + switch (hkey) { + case TP_HKEY_EV_BAYEJ_ACK: hotkey_autosleep_ack = 1; printk(TPACPI_INFO "bay ejected\n"); hotkey_wakeup_hotunplug_complete_notify_change(); known_ev = true; - } else { + break; + case TP_HKEY_EV_OPTDRV_EJ: + /* FIXME: kick libata if SATA link offline */ + known_ev = true; + break; + default: known_ev = false; } break;