From owner-svn-src-all@freebsd.org Wed Nov 13 15:31:32 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3470D1B3E8A; Wed, 13 Nov 2019 15:31:32 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47CpVr0fckz49L6; Wed, 13 Nov 2019 15:31:32 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EDE2C1A1A9; Wed, 13 Nov 2019 15:31:31 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xADFVV17041528; Wed, 13 Nov 2019 15:31:31 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xADFVVMV041527; Wed, 13 Nov 2019 15:31:31 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201911131531.xADFVVMV041527@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Wed, 13 Nov 2019 15:31:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354683 - head/sys/dev/fb X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: head/sys/dev/fb X-SVN-Commit-Revision: 354683 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Nov 2019 15:31:32 -0000 Author: scottl Date: Wed Nov 13 15:31:31 2019 New Revision: 354683 URL: https://svnweb.freebsd.org/changeset/base/354683 Log: Stop the VESA driver from whining loudly in the dmesg during boot on systems that use EFI instead of BIOS. Modified: head/sys/dev/fb/vesa.c Modified: head/sys/dev/fb/vesa.c ============================================================================== --- head/sys/dev/fb/vesa.c Wed Nov 13 14:28:07 2019 (r354682) +++ head/sys/dev/fb/vesa.c Wed Nov 13 15:31:31 2019 (r354683) @@ -1935,6 +1935,12 @@ vesa_load(void) if (error == 0) vesa_bios_info(bootverbose); + /* Don't return ENODEV, the upper layers will whine. */ + if (error == ENODEV) { + error = 0; + vesa_adp = NULL; + } + return (error); } @@ -1943,8 +1949,12 @@ vesa_unload(void) { int error; + /* The driver never initialized, so make it easy to unload. */ + if (vesa_adp == NULL) + return (0); + /* if the adapter is currently in a VESA mode, don't unload */ - if ((vesa_adp != NULL) && VESA_MODE(vesa_adp->va_mode)) + if (VESA_MODE(vesa_adp->va_mode)) return (EBUSY); /* * FIXME: if there is at least one vty which is in a VESA mode,