svn commit: r287180 - stable/10/sys/dev/sound/midi

2015-08-26 Thread Tai-hwa Liang
Author: avatar
Date: Wed Aug 26 22:59:58 2015
New Revision: 287180
URL: https://svnweb.freebsd.org/changeset/base/287180

Log:
  MFC r286886: Fixing typo as well as improving readability of a few comments.

Modified:
  stable/10/sys/dev/sound/midi/midi.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sound/midi/midi.c
==
--- stable/10/sys/dev/sound/midi/midi.c Wed Aug 26 22:52:18 2015
(r287179)
+++ stable/10/sys/dev/sound/midi/midi.c Wed Aug 26 22:59:58 2015
(r287180)
@@ -86,7 +86,7 @@ enum midi_states {
 };
 
 /*
- * The MPU interface current has init() uninit() inqsize(( outqsize()
+ * The MPU interface current has init() uninit() inqsize() outqsize()
  * callback() : fiddle with the tx|rx status.
  */
 
@@ -160,10 +160,15 @@ DEFINE_CLASS(midisynth, midisynth_method
 /*
  * Module Exports  Interface
  *
- * struct midi_chan *midi_init(MPU_CLASS cls, int unit, int chan) int
- * midi_uninit(struct snd_midi *) 0 == no error EBUSY or other error int
- * Midi_in(struct midi_chan *, char *buf, int count) int Midi_out(struct
- * midi_chan *, char *buf, int count)
+ * struct midi_chan *midi_init(MPU_CLASS cls, int unit, int chan,
+ * void *cookie)
+ * int midi_uninit(struct snd_midi *)
+ *
+ * 0 == no error
+ * EBUSY or other error
+ *
+ * int midi_in(struct snd_midi *, char *buf, int count)
+ * int midi_out(struct snd_midi *, char *buf, int count)
  *
  * midi_{in,out} return actual size transfered
  *
@@ -388,7 +393,7 @@ err0:   mtx_unlock(midistat_lock);
 
 /*
  * midi_uninit does not call MIDI_UNINIT, as since this is the implementors
- * entry point. midi_unint if fact, does not send any methods. A call to
+ * entry point. midi_uninit if fact, does not send any methods. A call to
  * midi_uninit is a defacto promise that you won't manipulate ch anymore
  *
  */
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to svn-src-stable-10-unsubscr...@freebsd.org


svn commit: r287184 - stable/10/cddl/contrib/opensolaris/cmd/ztest

2015-08-26 Thread Xin LI
Author: delphij
Date: Thu Aug 27 01:02:01 2015
New Revision: 287184
URL: https://svnweb.freebsd.org/changeset/base/287184

Log:
  MFC r286737:
  
  Plug a memory leak.

Modified:
  stable/10/cddl/contrib/opensolaris/cmd/ztest/ztest.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==
--- stable/10/cddl/contrib/opensolaris/cmd/ztest/ztest.cWed Aug 26 
23:58:03 2015(r287183)
+++ stable/10/cddl/contrib/opensolaris/cmd/ztest/ztest.cThu Aug 27 
01:02:01 2015(r287184)
@@ -5905,6 +5905,7 @@ ztest_init(ztest_shared_t *zs)
}
VERIFY3U(0, ==, spa_create(ztest_opts.zo_pool, nvroot, props, NULL));
nvlist_free(nvroot);
+   nvlist_free(props);
 
VERIFY3U(0, ==, spa_open(ztest_opts.zo_pool, spa, FTAG));
zs-zs_metaslab_sz =
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to svn-src-stable-10-unsubscr...@freebsd.org