diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-02-05 17:57:27 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-02 09:58:52 +0200 |
commit | 984c4e00c3877d400e8bbe5add6621931fbb358a (patch) | |
tree | 59d7a9654ea6c5839026ef083d86d8fabd063771 | |
parent | 1e0cab1bce57cf1618eeb57d399b6f9dfe49fa5b (diff) | |
download | linux-stable-984c4e00c3877d400e8bbe5add6621931fbb358a.tar.gz linux-stable-984c4e00c3877d400e8bbe5add6621931fbb358a.tar.bz2 linux-stable-984c4e00c3877d400e8bbe5add6621931fbb358a.zip |
ALSA: hda/ca0132 - Fix build error without CONFIG_PCI
[ Upstream commit c97617a81a7616d49bc3700959e08c6c6f447093 ]
A call of pci_iounmap() call without CONFIG_PCI leads to a build error
on some architectures. We tried to address this and add a check of
IS_ENABLED(CONFIG_PCI), but this still doesn't seem enough for sh.
Ideally we should fix it globally, it's really a corner case, so let's
paper over it with a simpler ifdef.
Fixes: 1e73359a24fa ("ALSA: hda/ca0132 - make pci_iounmap() call conditional")
Reported-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | sound/pci/hda/patch_ca0132.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 80f73810b21b..0436789e7cd8 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -7394,8 +7394,10 @@ static void ca0132_free(struct hda_codec *codec) ca0132_exit_chip(codec); snd_hda_power_down(codec); - if (IS_ENABLED(CONFIG_PCI) && spec->mem_base) +#ifdef CONFIG_PCI + if (spec->mem_base) pci_iounmap(codec->bus->pci, spec->mem_base); +#endif kfree(spec->spec_init_verbs); kfree(codec->spec); } |