linux-kernel - Re: [PATCH] ALSA: x86: hdmi: fix build with CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <s5hy3xpalqf.wl-tiwai@suse.de>
Date:   Wed, 01 Feb 2017 18:01:44 +0100
From:   Takashi Iwai <tiwai@...e.de>
To:     "Arnd Bergmann" <arnd@...db.de>
Cc:     "Jaroslav Kysela" <perex@...ex.cz>, <alsa-devel@...a-project.org>,
        "Jerome Anand" <jerome.anand@...el.com>,
        "Pierre-Louis Bossart" <pierre-louis.bossart@...ux.intel.com>,
        "Julia Lawall" <julia.lawall@...6.fr>,
        <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] ALSA: x86: hdmi: fix build with CONFIG_PM=n

On Wed, 01 Feb 2017 17:19:47 +0100,
Arnd Bergmann wrote:
> 
> The runtime_status field is defined conditionally and must not be accessed outside
> of #ifdef CONFIG_PM:
> 
> sound/x86/intel_hdmi_audio_if.c: In function 'hdmi_audio_suspend':
> sound/x86/intel_hdmi_audio_if.c:112:30: error: 'struct dev_pm_info' has no member named 'runtime_status'
>   if (intelhaddata->dev->power.runtime_status != RPM_SUSPENDED) {
> 
> pm_runtime_status_suspended() does what we need here.
> 
> Fixes: 5dab11d89777 ("ALSA: x86: hdmi: Add audio support for BYT and CHT")
> Signed-off-by: Arnd Bergmann <arnd@...db.de>

Thanks, I already have a similar fix in my local queue, but it wasn't
published yet as it depends on another patchset.  Now found in
topic/intel-lpe-audio-cleanup branch.

Hopefully the whole patches will be merged in this week.


Takashi

> ---
>  sound/x86/intel_hdmi_audio_if.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/x86/intel_hdmi_audio_if.c b/sound/x86/intel_hdmi_audio_if.c
> index 9ae242d62eb2..99eecef87e62 100644
> --- a/sound/x86/intel_hdmi_audio_if.c
> +++ b/sound/x86/intel_hdmi_audio_if.c
> @@ -109,7 +109,7 @@ int hdmi_audio_suspend(void *haddata, struct hdmi_audio_event event)
>  	had_stream = intelhaddata->private_data;
>  	substream = intelhaddata->stream_info.had_substream;
>  
> -	if (intelhaddata->dev->power.runtime_status != RPM_SUSPENDED) {
> +	if (!pm_runtime_status_suspended(intelhaddata->dev)) {
>  		pr_err("audio stream is active\n");
>  		return -EAGAIN;
>  	}
> -- 
> 2.9.0
> 
>