git: 3fc4d02c4b02 - main - sound/midi: Pair kobj_init() with kobj_delete()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Nov 2026 16:38:19 UTC
The branch main has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=3fc4d02c4b02e1af0627720597352965ad87eb02
commit 3fc4d02c4b02e1af0627720597352965ad87eb02
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-11-12 10:40:55 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-11-12 16:35:49 +0000
sound/midi: Pair kobj_init() with kobj_delete()
kobj_init() bumps the class refcount, so without a matching
kobj_delete() it never drops to zero.
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
---
sys/dev/sound/midi/midi.c | 4 ++--
sys/dev/sound/midi/mpu401.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index 694df4ef6aa7..790fdc05feac 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -134,7 +134,7 @@ midi_destroy(struct snd_midi *m)
free(m->inq.buf, M_MIDI);
free(m->outq.buf, M_MIDI);
mtx_destroy(&m->lock);
- free(m, M_MIDI);
+ kobj_delete((kobj_t)m, M_MIDI);
}
/*
@@ -157,7 +157,7 @@ midi_init(kobj_class_t cls, void *cookie)
outqsize = MPU_OUTQSIZE(m, cookie);
if (!inqsize && !outqsize) {
- free(m, M_MIDI);
+ kobj_delete((kobj_t)m, M_MIDI);
return (NULL);
}
diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c
index 81ab529262e3..4c070952b595 100644
--- a/sys/dev/sound/midi/mpu401.c
+++ b/sys/dev/sound/midi/mpu401.c
@@ -148,7 +148,7 @@ mpu401_init(kobj_class_t cls, void *cookie, driver_intr_t softintr,
return m;
err:
printf("mpu401_init error\n");
- free(m, M_MIDI);
+ kobj_delete((kobj_t)m, M_MIDI);
return NULL;
}
@@ -158,7 +158,7 @@ mpu401_uninit(struct mpu401 *m)
CMD(m, MPU_RESET);
midi_uninit(m->mid);
callout_drain(&m->timer);
- free(m, M_MIDI);
+ kobj_delete((kobj_t)m, M_MIDI);
return 0;
}