rpms/kernel/F-8 linux-2.6-acpi-button-send-initial-state.patch, NONE, 1.1 linux-2.6-alsa-drivers-set-device-links.patch, NONE, 1.1 kernel.spec, 1.284, 1.285

Chuck Ebbert (cebbert) fedora-extras-commits at redhat.com
Sat Dec 1 01:09:07 UTC 2007


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6785

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-acpi-button-send-initial-state.patch 
	linux-2.6-alsa-drivers-set-device-links.patch 
Log Message:
* Fri Nov 30 2007 Chuck Ebbert <cebbert at redhat.com>
- ALSA: fix missing controls on some drivers (#370821)
- ACPI: send initial button state on startup (#275651)


linux-2.6-acpi-button-send-initial-state.patch:

--- NEW FILE linux-2.6-acpi-button-send-initial-state.patch ---
X-Mozilla-Status: 0001
X-Mozilla-Status2: 00000000
Return-Path: <git-commits-head-owner at vger.kernel.org>
Received: from mail.boston.redhat.com ([unix socket])
	 by mail.boston.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
	 Tue, 30 Oct 2007 01:59:39 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.13.1/8.13.1) with ESMTP id l9U5xdWP032224;
	Tue, 30 Oct 2007 01:59:39 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l9U5xcB0021239;
	Tue, 30 Oct 2007 01:59:38 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id l9U5xIMZ013784;
	Tue, 30 Oct 2007 01:59:32 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1754184AbXJ3F7W (ORCPT <rfc822;cebbert at redhat.com> + 6 others);
	Tue, 30 Oct 2007 01:59:22 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1753207AbXJ3F7W
	(ORCPT <rfc822;git-commits-head-outgoing>);
	Tue, 30 Oct 2007 01:59:22 -0400
Received: from hera.kernel.org ([140.211.167.34]:58717 "EHLO hera.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753817AbXJ3F7N (ORCPT
	<rfc822;git-commits-head at vger.kernel.org>);
	Tue, 30 Oct 2007 01:59:13 -0400
Received: from hera.kernel.org (IDENT:U2FsdGVkX1/mtUfX+X/pWAb7kMwiSDi8AX/ODpZKfnA at localhost [127.0.0.1])
	by hera.kernel.org (8.13.8/8.13.8) with ESMTP id l9U5xCtG023624
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <git-commits-head at vger.kernel.org>; Tue, 30 Oct 2007 05:59:12 GMT
Received: (from dwmw2 at localhost)
	by hera.kernel.org (8.13.8/8.13.1/Submit) id l9U5xCpW023607
	for git-commits-head at vger.kernel.org; Tue, 30 Oct 2007 05:59:12 GMT
Date: 	Tue, 30 Oct 2007 05:59:12 GMT
Message-Id: <200710300559.l9U5xCpW023607 at hera.kernel.org>
From: Linux Kernel Mailing List <linux-kernel at vger.kernel.org>
To: git-commits-head at vger.kernel.org
Subject: ACPI: button: send initial lid state after add and resume
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Git-Commit: 23de5d9ef2a4bbc4f733f58311bcb7cf6239c813
X-Git-Parent: 1dbc1fda5d8ca907f320b806005d4a447977d26a
X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00,
	SUBJECT_FUZZY_TION autolearn=no version=3.2.3
X-Spam-Checker-Version: 	SpamAssassin 3.2.3 (2007-08-08) on hera.kernel.org
Sender: git-commits-head-owner at vger.kernel.org
Precedence: bulk
X-Mailing-List: 	git-commits-head at vger.kernel.org
X-RedHat-Spam-Score: 0.006 
X-Scanned-By: MIMEDefang 2.58 on 172.16.48.32

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=23de5d9ef2a4bbc4f733f58311bcb7cf6239c813
Commit:     23de5d9ef2a4bbc4f733f58311bcb7cf6239c813
Parent:     1dbc1fda5d8ca907f320b806005d4a447977d26a
Author:     Alexey Starikovskiy <astarikovskiy at suse.de>
AuthorDate: Mon Oct 22 14:18:18 2007 +0400
Committer:  Len Brown <len.brown at intel.com>
CommitDate: Thu Oct 25 16:31:30 2007 -0400

    ACPI: button: send initial lid state after add and resume
    
    Input layer should know about initial state of lid switch,
    even before first notify.
    
    Reference: https://bugzilla.novell.com/show_bug.cgi?id=326814
    
    Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
    Acked-by: Rafael J. Wysocki <rjw at sisk.pl>
    Signed-off-by: Len Brown <len.brown at intel.com>
---
 drivers/acpi/button.c |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 301e832..24a7865 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -78,6 +78,7 @@ MODULE_DEVICE_TABLE(acpi, button_device_ids);
 
 static int acpi_button_add(struct acpi_device *device);
 static int acpi_button_remove(struct acpi_device *device, int type);
+static int acpi_button_resume(struct acpi_device *device);
 static int acpi_button_info_open_fs(struct inode *inode, struct file *file);
 static int acpi_button_state_open_fs(struct inode *inode, struct file *file);
 
@@ -87,6 +88,7 @@ static struct acpi_driver acpi_button_driver = {
 	.ids = button_device_ids,
 	.ops = {
 		.add = acpi_button_add,
+		.resume = acpi_button_resume,
 		.remove = acpi_button_remove,
 	},
 };
@@ -253,6 +255,19 @@ static int acpi_button_remove_fs(struct acpi_device *device)
 /* --------------------------------------------------------------------------
                                 Driver Interface
    -------------------------------------------------------------------------- */
+static int acpi_lid_send_state(struct acpi_button *button)
+{
+	unsigned long state;
+	acpi_status status;
+
+	status = acpi_evaluate_integer(button->device->handle, "_LID", NULL,
+					&state);
+	if (ACPI_FAILURE(status))
+		return -ENODEV;
+	/* input layer checks if event is redundant */
+	input_report_switch(button->input, SW_LID, !state);
+	return 0;
+}
 
 static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
 {
@@ -265,15 +280,8 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
 	switch (event) {
 	case ACPI_BUTTON_NOTIFY_STATUS:
 		input = button->input;
-
 		if (button->type == ACPI_BUTTON_TYPE_LID) {
-			struct acpi_handle *handle = button->device->handle;
-			unsigned long state;
-
-			if (!ACPI_FAILURE(acpi_evaluate_integer(handle, "_LID",
-								NULL, &state)))
-				input_report_switch(input, SW_LID, !state);
-
+			acpi_lid_send_state(button);
 		} else {
 			int keycode = test_bit(KEY_SLEEP, input->keybit) ?
 						KEY_SLEEP : KEY_POWER;
@@ -336,6 +344,17 @@ static int acpi_button_install_notify_handlers(struct acpi_button *button)
 	return ACPI_FAILURE(status) ? -ENODEV : 0;
 }
 
+static int acpi_button_resume(struct acpi_device *device)
+{
+	struct acpi_button *button;
+	if (!device)
+		return -EINVAL;
+	button = acpi_driver_data(device);
+	if (button && button->type == ACPI_BUTTON_TYPE_LID)
+		return acpi_lid_send_state(button);
+	return 0;
+}
+
 static void acpi_button_remove_notify_handlers(struct acpi_button *button)
 {
 	switch (button->type) {
@@ -453,6 +472,8 @@ static int acpi_button_add(struct acpi_device *device)
 	error = input_register_device(input);
 	if (error)
 		goto err_remove_handlers;
+	if (button->type == ACPI_BUTTON_TYPE_LID)
+		acpi_lid_send_state(button);
 
 	if (device->wakeup.flags.valid) {
 		/* Button's GPE is run-wake GPE */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


linux-2.6-alsa-drivers-set-device-links.patch:

--- NEW FILE linux-2.6-alsa-drivers-set-device-links.patch ---
From: Takashi Iwai <tiwai at suse.de>
Date: Mon, 26 Nov 2007 07:45:43 +0000 (+0100)
Subject: [ALSA] emu10k1x - Add missing snd_card_set_dev call
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fperex%2Falsa.git;a=commitdiff_plain;h=27ab27100d74f0f5073fc8d50dea6aefffe20dda

[ALSA] emu10k1x - Add missing snd_card_set_dev call

Added the missing snd_card_set_dev() call.  This will fix the incomplete
sysfs entry for this card.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---

diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 1ec7eba..0030d8b 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -1583,6 +1583,8 @@ static int __devinit snd_emu10k1x_probe(struct pci_dev *pci,
 	sprintf(card->longname, "%s at 0x%lx irq %i",
 		card->shortname, chip->port, chip->irq);
 
+	snd_card_set_dev(card, &pci->dev);
+
 	if ((err = snd_card_register(card)) < 0) {
 		snd_card_free(card);
 		return err;
From: Takashi Iwai <tiwai at suse.de>
Date: Mon, 26 Nov 2007 07:58:48 +0000 (+0100)
Subject: [ALSA] drivers - Add missing snd_card_set_dev()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fperex%2Falsa.git;a=commitdiff_plain;h=8e43d0d0c58a8705cb7c8fb5b5ec03efef8643f7

[ALSA] drivers - Add missing snd_card_set_dev()

Added the missing call of snd_card_set_dev() in drivers/*

Signed-off-by: Takashi Iwai <tiwai at suse.de>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 68070cc..e12ba3d 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -1008,6 +1008,8 @@ static int __devinit snd_mts64_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, card);
 
+	snd_card_set_dev(card, &pdev->dev);
+
 	/* At this point card will be usable */
 	if ((err = snd_card_register(card)) < 0) {
 		snd_printd("Cannot register card\n");
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index 1b83287..7e7c668 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -797,6 +797,8 @@ static int __devinit snd_portman_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, card);
 
+	snd_card_set_dev(card, &pdev->dev);
+
 	/* At this point card will be usable */
 	if ((err = snd_card_register(card)) < 0) {
 		snd_printd("Cannot register card\n");


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- kernel.spec	30 Nov 2007 22:33:11 -0000	1.284
+++ kernel.spec	1 Dec 2007 01:08:32 -0000	1.285
@@ -598,6 +598,7 @@
 Patch82: linux-2.6-alsa-1.0.15-merge-3.patch
 Patch86: linux-2.6-alsa-support-sis7019.patch
 Patch87: linux-2.6-alsa-hda-stac-dmic.patch
+Patch88: linux-2.6-alsa-drivers-set-device-links.patch
 
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
@@ -696,6 +697,7 @@
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
 Patch750: linux-2.6-acpi-git-ec-init-fixes.patch
 Patch770: linux-2.6-pmtrace-time-fix.patch
+Patch780: linux-2.6-acpi-button-send-initial-state.patch
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch820: linux-2.6-compile-fixes.patch
@@ -1082,6 +1084,8 @@
 ApplyPatch linux-2.6-alsa-support-sis7019.patch
 # ALSA enhancments for 2.6.25
 ApplyPatch linux-2.6-alsa-hda-stac-dmic.patch
+# Fix missing controls on some devices caused by missing sysfs links
+ApplyPatch linux-2.6-alsa-drivers-set-device-links.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-mm-git.patch
@@ -1309,6 +1313,8 @@
 ApplyPatch linux-2.6-acpi-git-ec-init-fixes.patch
 # fix date/time display when using PM_TRACE
 ApplyPatch linux-2.6-pmtrace-time-fix.patch
+# Send button state on create / resume
+ApplyPatch linux-2.6-acpi-button-send-initial-state.patch
 
 # Fix excessive wakeups
 # Make hdaps timer only tick when in use.
@@ -1979,6 +1985,10 @@
 
 %changelog
 * Fri Nov 30 2007 Chuck Ebbert <cebbert at redhat.com>
+- ALSA: fix missing controls on some drivers (#370821)
+- ACPI: send initial button state on startup (#275651)
+
+* Fri Nov 30 2007 Chuck Ebbert <cebbert at redhat.com>
 - Disable e1000 link power management (#400561)
 
 * Fri Nov 30 2007 Jarod Wilson <jwilson at redhat.com>




More information about the fedora-extras-commits mailing list