From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751303Ab2KXLEa (ORCPT ); Sat, 24 Nov 2012 06:04:30 -0500 Received: from cantor2.suse.de ([195.135.220.15]:49555 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751058Ab2KXLE2 (ORCPT ); Sat, 24 Nov 2012 06:04:28 -0500 Date: Sat, 24 Nov 2012 12:04:26 +0100 Message-ID: From: Takashi Iwai To: Markus Trippelsdorf Cc: Linus Torvalds , Mark Brown , Liam Girdwood , linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] sound fixes for 3.7-rc7 In-Reply-To: <20121124094610.GA221@x4> References: <20121124094610.GA221@x4> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Sat, 24 Nov 2012 10:46:10 +0100, Markus Trippelsdorf wrote: > > On 2012.11.23 at 14:23 +0100, Takashi Iwai wrote: > > Sound fixes for 3.7-rc7 > > > > The highlight of this update is the fixes for ASoC kirkwood by Russell. > > In addition to that, a couple of regression fixes for HD-audio due to > > the runtime PM support on 3.7, and other driver-specific regression > > fixes like USB MIDI on non-standard USB audio drivers. > > > > Takashi Iwai (2): > > ALSA: hda - Fix recursive suspend/resume call > > This commit causes with !CONFIG_PM: > > ound/pci/hda/hda_codec.c: In function ‘codec_exec_verb’: > sound/pci/hda/hda_codec.c:231:12: error: ‘struct hda_codec’ has no member named ‘in_pm’ > if (!codec->in_pm && res && *res == -1 && bus->rirb_error) { > ^ > sound/pci/hda/hda_codec.c:241:19: error: ‘struct hda_codec’ has no member named ‘in_pm’ > if (!err || codec->in_pm) > ^ > make[3]: *** [sound/pci/hda/hda_codec.o] Error 1 Oops sorry. I fixed now with the patch below. I'm going to send another pull request for this fix. thanks, Takashi --- From: Takashi Iwai Subject: [PATCH] ALSA: hda - Fix build without CONFIG_PM I forgot this again... codec->in_pm is in #ifdef CONFIG_PM Reported-by: Markus Trippelsdorf Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_codec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index cebe2dfd..d010de1 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -95,6 +95,7 @@ int snd_hda_delete_codec_preset(struct hda_codec_preset_list *preset) EXPORT_SYMBOL_HDA(snd_hda_delete_codec_preset); #ifdef CONFIG_PM +#define codec_in_pm(codec) ((codec)->in_pm) static void hda_power_work(struct work_struct *work); static void hda_keep_power_on(struct hda_codec *codec); #define hda_codec_is_power_on(codec) ((codec)->power_on) @@ -104,6 +105,7 @@ static inline void hda_call_pm_notify(struct hda_bus *bus, bool power_up) bus->ops.pm_notify(bus, power_up); } #else +#define codec_in_pm(codec) 0 static inline void hda_keep_power_on(struct hda_codec *codec) {} #define hda_codec_is_power_on(codec) 1 #define hda_call_pm_notify(bus, state) {} @@ -228,7 +230,7 @@ static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd, } mutex_unlock(&bus->cmd_mutex); snd_hda_power_down(codec); - if (!codec->in_pm && res && *res == -1 && bus->rirb_error) { + if (!codec_in_pm(codec) && res && *res == -1 && bus->rirb_error) { if (bus->response_reset) { snd_printd("hda_codec: resetting BUS due to " "fatal communication error\n"); @@ -238,7 +240,7 @@ static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd, goto again; } /* clear reset-flag when the communication gets recovered */ - if (!err || codec->in_pm) + if (!err || codec_in_pm(codec)) bus->response_reset = 0; return err; } -- 1.8.0