diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-12-10 21:54:25 +0100 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2018-12-11 09:15:39 +0100 |
| commit | 1e73359a24fad529b0794515b46cbfff99e5fbe6 (patch) | |
| tree | 0bec6350a29da857e8239416693a60336ee93199 /sound | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| download | linux-dev-1e73359a24fad529b0794515b46cbfff99e5fbe6.tar.xz linux-dev-1e73359a24fad529b0794515b46cbfff99e5fbe6.zip | |
ALSA: hda/ca0132 - make pci_iounmap() call conditional
When building without CONFIG_PCI, we can (depending on the architecture)
get a link failure:
ERROR: "pci_iounmap" [sound/pci/hda/snd-hda-codec-ca0132.ko] undefined!
Adding a compile-time check for PCI gets it to work correctly on
32-bit ARM.
Fixes: d99501b8575d ("ALSA: hda/ca0132 - Call pci_iounmap() instead of iounmap()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_ca0132.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index c40cb6336017..e5bdbc245682 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -8451,7 +8451,7 @@ static void ca0132_free(struct hda_codec *codec) ca0132_exit_chip(codec); snd_hda_power_down(codec); - if (spec->mem_base) + if (IS_ENABLED(CONFIG_PCI) && spec->mem_base) pci_iounmap(codec->bus->pci, spec->mem_base); kfree(spec->spec_init_verbs); kfree(codec->spec); |