From patchwork Sun Dec 27 00:52:13 2009 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: 69810 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.2) with ESMTP id nBR0qPPC015917 for ; Sun, 27 Dec 2009 00:52:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751868AbZL0AwY (ORCPT ); Sat, 26 Dec 2009 19:52:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752288AbZL0AwY (ORCPT ); Sat, 26 Dec 2009 19:52:24 -0500 Received: from out1.smtp.messagingengine.com ([66.111.4.25]:33685 "EHLO out1.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751868AbZL0AwX (ORCPT ); Sat, 26 Dec 2009 19:52:23 -0500 Received: from compute1.internal (compute1.internal [10.202.2.41]) by gateway1.messagingengine.com (Postfix) with ESMTP id 8101EC924A; Sat, 26 Dec 2009 19:52:22 -0500 (EST) Received: from heartbeat1.messagingengine.com ([10.202.2.160]) by compute1.internal (MEProxy); Sat, 26 Dec 2009 19:52:22 -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=j/7QxblFRPpSMjBCrXBqHm7/wLM=; b=MNv4QFDIDPCpSXOGCOPHN/QhV0vU4ydwbgj2qtZ1obd98/BMAU4ykICu3F3OHaUFtQL56A7TSockHU21ZDIxQwQUuHfC26Ls5qb9ckyG7ZuWSCZ4ydjVZx/C2jN3fbfW0bZlXqWFYh5mqfP6Yrd9x5t2EbmBnPw238mX9J+Y/8U= X-Sasl-enc: 9c46Z5o/9um4I3pd2m+zIHQe+nTZvVTXSK8VGmzTe/GD 1261875142 Received: from khazad-dum.debian.net (unknown [201.82.165.62]) by mail.messagingengine.com (Postfix) with ESMTPSA id 26EE6379F3F; Sat, 26 Dec 2009 19:52:22 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by localhost.khazad-dum.debian.net (Postfix) with ESMTP id DA2E128244; Sat, 26 Dec 2009 22:52:19 -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 OvLlG3oPNDPx; Sat, 26 Dec 2009 22:52:19 -0200 (BRST) Received: by khazad-dum.debian.net (Postfix, from userid 1000) id 3E113281F9; Sat, 26 Dec 2009 22:52:19 -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/5] thinkpad-acpi: don't take the first ALSA slot by default Date: Sat, 26 Dec 2009 22:52:13 -0200 Message-Id: <1261875137-27565-2-git-send-email-hmh@hmh.eng.br> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1261875137-27565-1-git-send-email-hmh@hmh.eng.br> References: <1261875137-27565-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 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 448c8ae..3311b00 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -6388,7 +6388,7 @@ static struct ibm_struct brightness_driver_data = { #define TPACPI_ALSA_SHRTNAME "ThinkPad Console Audio Control" #define TPACPI_ALSA_MIXERNAME TPACPI_ALSA_SHRTNAME -static int alsa_index = SNDRV_DEFAULT_IDX1; +static int alsa_index = ~((1 << (SNDRV_CARDS - 3)) - 1); /* last three slots */ static char *alsa_id = "ThinkPadEC"; static int alsa_enable = SNDRV_DEFAULT_ENABLE1;