From patchwork Fri Jun 18 12:32:30 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jiri Kosina <jkosina@suse.cz>
X-Patchwork-Id: 106844
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 o5ICWXcE019080
	for <patchwork-linux-input@patchwork.kernel.org>;
	Fri, 18 Jun 2010 12:32:33 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1761179Ab0FRMcd (ORCPT
	<rfc822;patchwork-linux-input@patchwork.kernel.org>);
	Fri, 18 Jun 2010 08:32:33 -0400
Received: from cantor2.suse.de ([195.135.220.15]:34727 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1761177Ab0FRMcc (ORCPT <rfc822;linux-input@vger.kernel.org>);
	Fri, 18 Jun 2010 08:32:32 -0400
Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2])
	by mx2.suse.de (Postfix) with ESMTP id 83A0D87104;
	Fri, 18 Jun 2010 14:32:31 +0200 (CEST)
Date: Fri, 18 Jun 2010 14:32:30 +0200 (CEST)
From: Jiri Kosina <jkosina@suse.cz>
To: Andrew Kohlsmith <akohlsmith@mixdown.ca>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Subject: Re: [patch] add quirk to fix volume wheel on Toshiba U300 laptops
In-Reply-To: <201006091337.10152.akohlsmith@mixdown.ca>
Message-ID: <alpine.LNX.2.00.1006181431080.13809@pobox.suse.cz>
References: <201006091337.10152.akohlsmith@mixdown.ca>
User-Agent: Alpine 2.00 (LNX 1167 2008-08-23)
MIME-Version: 1.0
Sender: linux-input-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-input.vger.kernel.org>
X-Mailing-List: linux-input@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]);
	Fri, 18 Jun 2010 12:32:33 +0000 (UTC)


diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index d358ef8..f1e1801 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -1715,6 +1715,22 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = {
 		.callback = atkbd_setup_scancode_fixup,
 		.driver_data = atkbd_oqo_01plus_scancode_fixup,
 	},
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Satellite U300"),
+		},
+		.callback = atkbd_setup_forced_release,
+		.driver_data = atkbd_volume_forced_release_keys,
+	},
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Satellite Pro U300"),
+		},
+		.callback = atkbd_setup_forced_release,
+		.driver_data = atkbd_volume_forced_release_keys,
+	},
 	{ }
 };