From owner-svn-src-all@freebsd.org Sat Sep 1 13:43:15 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 837CFFEFF15; Sat, 1 Sep 2018 13:43:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2AFFA8C35A; Sat, 1 Sep 2018 13:43:15 +0000 (UTC) (envelope-from gjb@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 205642F42; Sat, 1 Sep 2018 13:43:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w81DhE8K058249; Sat, 1 Sep 2018 13:43:14 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w81DhEmG058248; Sat, 1 Sep 2018 13:43:14 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201809011343.w81DhEmG058248@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 1 Sep 2018 13:43:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338423 - in head/sys: dev/sound/midi dev/sound/pci modules/sound/driver/csa X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in head/sys: dev/sound/midi dev/sound/pci modules/sound/driver/csa X-SVN-Commit-Revision: 338423 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.27 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: Sat, 01 Sep 2018 13:43:15 -0000 Author: gjb Date: Sat Sep 1 13:43:14 2018 New Revision: 338423 URL: https://svnweb.freebsd.org/changeset/base/338423 Log: Revert r338422, which was did not get official approval from re@. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Deleted: head/sys/dev/sound/pci/csamidi.c Modified: head/sys/dev/sound/midi/midi.c head/sys/modules/sound/driver/csa/Makefile Modified: head/sys/dev/sound/midi/midi.c ============================================================================== --- head/sys/dev/sound/midi/midi.c Sat Sep 1 11:26:53 2018 (r338422) +++ head/sys/dev/sound/midi/midi.c Sat Sep 1 13:43:14 2018 (r338423) @@ -1467,14 +1467,18 @@ midi_modevent(module_t mod, int type, void *data) switch (type) { case MOD_LOAD: retval = midi_load(); +#if 0 if (retval == 0) retval = seq_modevent(mod, type, data); +#endif break; case MOD_UNLOAD: retval = midi_unload(); +#if 0 if (retval == 0) retval = seq_modevent(mod, type, data); +#endif break; default: Modified: head/sys/modules/sound/driver/csa/Makefile ============================================================================== --- head/sys/modules/sound/driver/csa/Makefile Sat Sep 1 11:26:53 2018 (r338422) +++ head/sys/modules/sound/driver/csa/Makefile Sat Sep 1 13:43:14 2018 (r338423) @@ -3,7 +3,7 @@ .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_csa -SRCS= device_if.h bus_if.h mpufoi_if.h pci_if.h -SRCS+= csa.c csamidi.c csapcm.c +SRCS= device_if.h bus_if.h pci_if.h +SRCS+= csa.c csapcm.c .include