From: Takashi Iwai <tiwai@suse•de>
To: piotr@hosowicz•com
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Randy Dunlap <randy.dunlap@oracle•com>,
tj@kernel•org, linux-next@vger•kernel.org
Subject: Re: Intel sound proke in today;s next
Date: Tue, 27 Jul 2010 07:41:18 +0200 [thread overview]
Message-ID: <s5haapda3cx.wl%tiwai@suse.de> (raw)
In-Reply-To: <4C4DF612.6020404@example.com>
At Mon, 26 Jul 2010 22:54:42 +0200,
Piotr Hosowicz wrote:
>
> On 26.07.2010 22:17, Takashi Iwai wrote:
>
> >>>> You need to pass the branch. In this case, pass for-next
> >>>
> >>> I passed topic/hda and rebuilt the kernel and now everything is working.
> >>
> >> I have just git pulled for-next and saw many files downloaded so I
> >> wonder how synced with topic/hda it's working.
> >
> > It contains other two branches, topic/misc and topic/asoc.
> > (Also sometimes missing fix/asoc and fix/misc merges).
> >
> > topic/asoc branch is specific to ASoC, so very likely irrelevant.
> > If any, some changes in the sound core code in topic/misc might
> > influence in your case...
>
> Ok, so I'll use for-next then. Thank you again, you taught me a lot.
I guess you hit the regression fixed right now, so slipped from
today's linux-next. The patch is below.
(The reason why topic/hda branch worked is that I pulled the changes
to topic/misc branch from Jaroslav's tree because his branch
contains more other changes than HD-audio specific. And I forgot
about this commit until today, grrr.)
thanks,
Takashi
---
>From 1a9bbe35dd5c0d0d6322d828779c2abbdd927340 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical•com>
Date: Tue, 27 Jul 2010 00:10:34 +0200
Subject: [PATCH] ALSA: hda: Fixup commit 79c944ad (caused codec initialization failure)
Commit 79c944ad caused codecs not to be detected in some cases,
found on several Realtek codecs.
Signed-off-by: David Henningsson <david.henningsson@canonical•com>
Signed-off-by: Takashi Iwai <tiwai@suse•de>
---
sound/pci/hda/hda_codec.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 6e0de65..88f26e2 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -724,23 +724,24 @@ static int get_codec_name(struct hda_codec *codec)
*/
static void /*__devinit*/ setup_fg_nodes(struct hda_codec *codec)
{
- int i, total_nodes, function_id;
+ int i, total_nodes, function_id, param_val;
hda_nid_t nid;
total_nodes = snd_hda_get_sub_nodes(codec, AC_NODE_ROOT, &nid);
for (i = 0; i < total_nodes; i++, nid++) {
- function_id = snd_hda_param_read(codec, nid,
+ param_val = snd_hda_param_read(codec, nid,
AC_PAR_FUNCTION_TYPE);
+ function_id = param_val & 0xff;
switch (function_id) {
case AC_GRP_AUDIO_FUNCTION:
codec->afg = nid;
- codec->afg_function_id = function_id & 0xff;
- codec->afg_unsol = (function_id >> 8) & 1;
+ codec->afg_function_id = function_id;
+ codec->afg_unsol = (param_val >> 8) & 1;
break;
case AC_GRP_MODEM_FUNCTION:
codec->mfg = nid;
- codec->mfg_function_id = function_id & 0xff;
- codec->mfg_unsol = (function_id >> 8) & 1;
+ codec->mfg_function_id = function_id;
+ codec->mfg_unsol = (param_val >> 8) & 1;
break;
default:
break;
--
1.7.2
next prev parent reply other threads:[~2010-07-27 5:41 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 6:49 linux-next: Tree for July 23 Stephen Rothwell
2010-07-23 16:08 ` linux-next: Tree for July 23 (fscache) Randy Dunlap
2010-07-23 18:24 ` Intel sound proke in today;s next Piotr Hosowicz
2010-07-23 18:27 ` Piotr Hosowicz
2010-07-24 1:59 ` Stephen Rothwell
2010-07-25 15:27 ` Takashi Iwai
2010-07-25 15:56 ` Piotr Hosowicz
2010-07-26 7:29 ` Takashi Iwai
2010-07-26 16:57 ` Piotr Hosowicz
2010-07-26 17:24 ` Takashi Iwai
2010-07-26 17:33 ` Piotr Hosowicz
2010-07-26 18:00 ` Takashi Iwai
2010-07-26 18:30 ` Piotr Hosowicz
2010-07-26 19:03 ` Piotr Hosowicz
2010-07-26 20:17 ` Takashi Iwai
2010-07-26 20:54 ` Piotr Hosowicz
2010-07-27 5:41 ` Takashi Iwai [this message]
2010-07-24 9:14 ` [PATCH wq#for-next] fscache: fix build on !CONFIG_SYSCTL Tejun Heo
2010-07-25 22:18 ` Randy Dunlap
2010-07-23 16:41 ` [PATCH -next] compal-laptop: depends on POWER_SUPPLY Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5haapda3cx.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=piotr@hosowicz$(echo .)com \
--cc=randy.dunlap@oracle$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox