diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2019-02-14 17:46:56 +0100 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2019-02-14 17:46:56 +0100 |
commit | 338618ad2a01b821a34e089a6607143fb283dee3 (patch) | |
tree | adf9aff96a5a087c820251f3eb09928b3271b007 /sound/pci/hda/patch_ca0132.c | |
parent | 18769445ca55c2277d29e35ffda7e9a206b1758f (diff) | |
parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) | |
download | lwn-338618ad2a01b821a34e089a6607143fb283dee3.tar.gz lwn-338618ad2a01b821a34e089a6607143fb283dee3.zip |
Merge branch 'i2c/for-current' into i2c/for-5.1
Diffstat (limited to 'sound/pci/hda/patch_ca0132.c')
-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 e5bdbc245682..29882bda7632 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -8451,8 +8451,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); } |