Message ID | 20181210205445.2913413-1-arnd@arndb.de |
---|---|
State | Accepted |
Commit | 1e73359a24fad529b0794515b46cbfff99e5fbe6 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4001287ljp; Mon, 10 Dec 2018 12:55:03 -0800 (PST) X-Google-Smtp-Source: AFSGD/U1spB/ZKRCqZxB3HskeUQKN/VjRA37jpAipO7jKeaZHFnJPSPL+qfa9uuI+tSg6J8asvP0 X-Received: by 2002:adf:f3c6:: with SMTP id g6mr11003822wrp.111.1544475303805; Mon, 10 Dec 2018 12:55:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544475303; cv=none; d=google.com; s=arc-20160816; b=T1kFdaPyuVhaL4XI43iaVWkEF3mWlkMn85k8oktAnHRr69Wn6wqBZmnN8JnNQxr9Q0 Zh0f+9Uo+kcYgzgHW2/Td77VN/oSmx3L+0G4KnvaPOrn9vlITG4c+3UlOP0wW51UVSEd EXnmuZDGLRPIlqUmHAdSJ3nTEsEbHq1E4R6JGM9x3Qz1aB40gxJUcpFox2fHZPLza/x+ EMCbjPthB05luXPlRi1EI106w6hP54H2k5KZ4Y5MGtFiQSKY7kp/ssIQOfESoXmqahm0 FOfId/ASqYchkItEghewe3GyM2wVex3fWRIVtWQXROBrTfXdHQpEeb4Vt+V7IeHmOvSO Gu2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:message-id:date:to:from:delivered-to; bh=M6An+zdv9pHAYSmO2rwLHTb0CVkV6JzP+qzOS80ZgSM=; b=AgziSW5dRo7C4NUkPpGIhbyfWLrPwoJUrRRyOe1SVdE+o7brpgq0zWJMIfT5FOIho6 HP0DEOI0y7eqcVQg3yuSqpZXJG21Rq4mC1TfLG1iiNFAmi0EoTBexsldonRZ1UzTOQmd MIo3SH9S0tdNywfqOV8ARSQjaiRmff3tHAtCRxx2N0kf6H9RXE3xasQWdj7fKqSJSi87 PdwX8hgeT6JZdvf+6wBvlP6EhG9Sko6gtMw9EAPnWMyCdG8XCpX8W1fQD7CQKnGttIXt ObEcs/lPAHcTpoTG6HP8RQLejenRTrdz38vF+45HVEYbDEdYaKGWbGsikR+ryL5MMmOo FxFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: <alsa-devel-bounces@alsa-project.org> Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id i184si40190wmd.11.2018.12.10.12.55.03; Mon, 10 Dec 2018 12:55:03 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 1E0FE267B2B; Mon, 10 Dec 2018 21:55:02 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 505EB267B2D; Mon, 10 Dec 2018 21:54:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) by alsa0.perex.cz (Postfix) with ESMTP id C699C267AFE for <alsa-devel@alsa-project.org>; Mon, 10 Dec 2018 21:54:56 +0100 (CET) Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MryKp-1hHusn2Rt7-00nyn0; Mon, 10 Dec 2018 21:54:48 +0100 From: Arnd Bergmann <arnd@arndb.de> To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Connor McAdams <conmanx360@gmail.com>, Takashi Sakamoto <o-takashi@sakamocchi.jp> Date: Mon, 10 Dec 2018 21:54:25 +0100 Message-Id: <20181210205445.2913413-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:F4RDkWOdHd/Trvm9PYXyPHgh1AWbnLIVcutmzHJWoa1WND9rUTB g3h2yvlDzxCeMvXeLCBjyEQ0BR2w3QaJ7yxJPS5Ceg+50FH8n+I49MPmuOpJoW0ahnOao+x Pr0aF2CJ1k8TlPDoMFSTiDqRDvBBd3hvb6+Ql2Y9evFRVSV8pvPcmKXWwCCgEPSqVIoQGQp L/Wufo/qQdsMP3nBn7nRA== X-UI-Out-Filterresults: notjunk:1; V03:K0:mMzYYV3G32c=:up9mTc/mS2SmLgM2fa1OKu KY4ORKlrNHMD8KRVFuWui4tF8o4XPB9ot3L7EN+X3jaKO4lth/NaO4oFAkGBGN9QAZqNW0piW xSWAXWLwQATS5cSfOB9oDJQQV4gznI82DK8BSf4tXTEOqpM+pGjjYY4QsfFT6TM7YnqAi50QS cugq3FtuwKS2Ip3eYIHEPRRLSQCjj+zDEEie9BgEHUFPXK1eMxQRnwXTuzpsKh6+qfDId0so7 uxlje3fLAdhVi/+fcBpxhaQs8Fs7L05SPpOwSbG4Lpl/xdb8rTdwpthjg/tSLhLuHEDKJx4k/ ABW8I+QUYO/VErEAzeg84N/yH9dKpuCRhexUdCNZwK16KffjvDELlNl2DA5wdfAdjcEDa2gVP /Xss1gDhCjzXtDEYNXGeybaalmLzC0I5ZitSIyPz7lmXsS+GbA9mw7thhqQcGqQfQHR/J2g4t PliaYdTZ65D8PN+ZIZ9tOYgXcRP9k+01yOjrzyMcZkULf/ql+hS4KNgxbzRYbJ7ENStjWGQEZ GDIJL2X6rmDifSn0mnFkOQFXVnrGoKWz9InIow9Iu53O25OCBWRLBs4INfRKAnSpiK15ahiDY L4gzS/DxalL1U9LnDH+Aj+Z1rr6QYl7bMK3lGdTwFCJ/T+vDjdS03N/xeBu8aVuXIrmkkXHrQ svXeuI79T3yoUutclfyHUrc1eGfh06tNYwNOwlprEepruvVjf4/30ZtohaiwD4bt402Dczr6T MNT7am3lS3rp/uLFWIg/NpNGQCTSTFteO2BaCQ== Cc: alsa-devel@alsa-project.org, Alastair Bridgewater <alastair.bridgewater@gmail.com>, linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de> Subject: [alsa-devel] [PATCH] ALSA: hda/ca0132 - make pci_iounmap() call conditional X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" <alsa-devel.alsa-project.org> List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org |
Series |
ALSA: hda/ca0132 - make pci_iounmap() call conditional
|
expand
|
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);
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. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- sound/pci/hda/patch_ca0132.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel