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

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

[David Henningsson]

[-- Attachment #1: Type: text/plain, Size: 117 bytes --]

The new warning gave a false alarm, now silenced.

-- 
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

[-- Attachment #2: 0006-Do-not-try-to-create-speaker-NIDs-for-ALC268-if-ther.patch --]
[-- Type: text/x-patch, Size: 901 bytes --]

>From e2b3d05db4d825701c6033567fc7b89283372f44 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
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

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/patch_realtek.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 49c04fc..cf14b00 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -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;
-- 
1.7.0.4


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] Do not try to create speaker NIDs for ALC268 if there aren't any

[Takashi Iwai]

At Mon, 02 Aug 2010 14:48:19 +0200,
David Henningsson wrote:
> 
> [1  <text/plain; ISO-8859-1 (7bit)>]
> The new warning gave a false alarm, now silenced.

Applied now.  Thanks.


Takashi

> 
> -- 
> 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)>]
> >From e2b3d05db4d825701c6033567fc7b89283372f44 Mon Sep 17 00:00:00 2001
> From: David Henningsson <david.henningsson@canonical.com>
> 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
> 
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> ---
>  sound/pci/hda/patch_realtek.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index 49c04fc..cf14b00 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -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;
> -- 
> 1.7.0.4
>