Skip to contentSkip to conversation

Do not try to create speaker NIDs for ALC268 if there aren't any

PATCH In review David Henningsson 2 participants 2 messages Aug 2, 2010 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Do not try to create speaker NIDs for ALC268 if there aren't any

The new warning gave a false alarm, now silenced.

Signature · 2 lines
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic
Quoted 1 line

From e2b3d05db4d825701c6033567fc7b89283372f44 Mon Sep 17 00:00:00 2001

From: David Henningsson <[email protected]>
Date: Mon, 2 Aug 2010 13:13:25 +0200
Subject: [PATCH] Do not try to create speaker NIDs for ALC268 if there aren't any

---
 sound/pci/hda/patch_realtek.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/pci/hda/patch_realtek.c +1 -1
index 49c04fc..cf14b00 100644
@@ -13216,7 +13216,7 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,
 				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
 		if (err < 0)
 			return err;
-	} else {
+	} else if (nid) {
 		err = alc268_new_analog_output(spec, nid, "Speaker", 0);
 		if (err < 0)
 			return err;
Signature · 1 line
1.7.0.4

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#1 lore raw

At Mon, 02 Aug 2010 14:48:19 +0200,

Quoted 3 lines · David Henningsson

[1 <text/plain; ISO-8859-1 (7bit)>]
The new warning gave a false alarm, now silenced.

Applied now. Thanks.

Takashi

Quoted 31 lines
Signature · 4 lines
-- 
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic
[2 0006-Do-not-try-to-create-speaker-NIDs-for-ALC268-if-ther.patch <text/x-patch (7bit)>]
Quoted 1 line

From e2b3d05db4d825701c6033567fc7b89283372f44 Mon Sep 17 00:00:00 2001

From: David Henningsson <[email protected]>
Date: Mon, 2 Aug 2010 13:13:25 +0200
Subject: [PATCH] Do not try to create speaker NIDs for ALC268 if there aren't any

---
 sound/pci/hda/patch_realtek.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/pci/hda/patch_realtek.c +1 -1
index 49c04fc..cf14b00 100644
@@ -13216,7 +13216,7 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,
 				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
 		if (err < 0)
 			return err;
-	} else {
+	} else if (nid) {
 		err = alc268_new_analog_output(spec, nid, "Speaker", 0);
 		if (err < 0)
 			return err;
Signature · 1 line
1.7.0.4