svn commit: r338423 - in head/sys: dev/sound/midi dev/sound/pci modules/sound/driver/csa

[Glen Barber]

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 at .
  
  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 <bsd.kmod.mk>