From patchwork Mon Oct 11 13:46:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 515622 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4477005ime; Mon, 11 Oct 2021 07:08:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbq6NsZ1MZZLwKmVvtjJ+8+7LuCWAefPJLeiy8sjV952CBEBJ5PR0zbidITv/x8mXX9/CV X-Received: by 2002:a1c:6a11:: with SMTP id f17mr13551338wmc.132.1633961315446; Mon, 11 Oct 2021 07:08:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633961315; cv=none; d=google.com; s=arc-20160816; b=N2Q/DJrl4flUCoXn9KqCftaU7ARYFE/VCJPhqPgm9WCVzkDKGOoHJz+FYv4FJ7glfr B4ConchJov2E/HSos9QeBRwM3pTmiBjA2/piYTc9uLVAz8GccV0ksSCZA1acsFMgTJt9 4XdojkX3UKLDkCQsBHG7XH2G72vuLJAfIOmH4yf0FiBxeQNwRfr6J+Y2lHw9daPsdsQb uCWfZ7UdMXcVDC2hjBkmn1sTrBqAMLeSku/LCPBk4Kiy0YFDSZqjsyl/doFrSNOrfMc3 WEJfSmTK3trE2Um1B1i6O+qJu+6CZURLF7IjV17ml9G7Ojy1qOWbkr6zCV6jqmcPPyqN 9biw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mYjRLAZ7HEMoahrmPa09nAGc/F4K3W2PyytzI0lVMB4=; b=A5WGnTGuPIatG04Aal8o7Y80Az5cwJogVuV27hYCioDlwAiSiKLkqxT3JKbIDltuKq F6XG7n+LW+rQxLOsCauZCIwKcm7W7ENOcF6ZtZO3iJIqtfCj9gkS14Pq6PYdF+imXXkG rSNWmbu3QCZQXvYdnoJZQan8FIjHoIpA4wgbA8U69BGc1OIEwe61TVmucKatDOnlET1Q iqoXk+f85i6yB8Skckx5Z/dOx7KDnos4Io+Ycdlkcyn8lkvQmhA1luJL1TtsXXIOAPsr dXstpRvCoVJDqKUsDNwBbEHXBRvYYnHDE0THqRXIoPphFJPDiAsH+zC/7yH5LdlHoOiV B6QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=u3dRrIyT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b13si19360482ede.572.2021.10.11.07.08.34; Mon, 11 Oct 2021 07:08:35 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=u3dRrIyT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241074AbhJKOKc (ORCPT + 11 others); Mon, 11 Oct 2021 10:10:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:33434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241864AbhJKOIb (ORCPT ); Mon, 11 Oct 2021 10:08:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D2BC66124F; Mon, 11 Oct 2021 14:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960886; bh=tx2s8Vfs7vROGq+0y/pyfaiNWVs4C19XcKOE+UM9Gyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u3dRrIyTAt4HimuDon5do5OZMvd0yZuanquUlqjd3lGlyLb3t22cSOmeFR7cDNaqA hG/d1NMjwZaEPVHYEwXyZkwh2ZDTzGipBg6QPHIY8pTJe3Mtnyh4vFOKi8XYHP2Hfy KObmsesJCYxNQ/Tya+jYDxhhHy0aIjuiWvNmr7Wc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Brown , Bartlomiej Zolnierkiewicz , Daniel Vetter , Maarten Lankhorst , Sasha Levin Subject: [PATCH 5.14 102/151] video: fbdev: gbefb: Only instantiate device when built for IP32 Date: Mon, 11 Oct 2021 15:46:14 +0200 Message-Id: <20211011134521.113118342@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134517.833565002@linuxfoundation.org> References: <20211011134517.833565002@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown [ Upstream commit 11b8e2bb986d23157e82e267fb8cc6b281dfdee9 ] The gbefb driver not only registers a driver but also the device for that driver. This is all well and good when run on the IP32 machines that are supported by the driver but since the driver supports building with COMPILE_TEST we might also be building on other platforms which do not have this hardware and will crash instantiating the driver. Add an IS_ENABLED() check so we compile out the device registration if we don't have the Kconfig option for the machine enabled. Fixes: 552ccf6b259d290c0c ("video: fbdev: gbefb: add COMPILE_TEST support") Signed-off-by: Mark Brown Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20210921212102.30803-1-broonie@kernel.org Signed-off-by: Maarten Lankhorst Signed-off-by: Sasha Levin --- drivers/video/fbdev/gbefb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.33.0 diff --git a/drivers/video/fbdev/gbefb.c b/drivers/video/fbdev/gbefb.c index c5b99a4861e8..6b4d5a7f3e15 100644 --- a/drivers/video/fbdev/gbefb.c +++ b/drivers/video/fbdev/gbefb.c @@ -1267,7 +1267,7 @@ static struct platform_device *gbefb_device; static int __init gbefb_init(void) { int ret = platform_driver_register(&gbefb_driver); - if (!ret) { + if (IS_ENABLED(CONFIG_SGI_IP32) && !ret) { gbefb_device = platform_device_alloc("gbefb", 0); if (gbefb_device) { ret = platform_device_add(gbefb_device);