Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pad pad(4): Destroy the callout when done.



details:   https://anonhg.NetBSD.org/src/rev/e092d19d2143
branches:  trunk
changeset: 379684:e092d19d2143
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Jun 14 10:21:21 2021 +0000

description:
pad(4): Destroy the callout when done.

Should not be possible for it to be pending or firing at this point,
because we have detached the audio(4) child and so it should have
halted output.

diffstat:

 sys/dev/pad/pad.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r c8eec91093b7 -r e092d19d2143 sys/dev/pad/pad.c
--- a/sys/dev/pad/pad.c Mon Jun 14 10:14:58 2021 +0000
+++ b/sys/dev/pad/pad.c Mon Jun 14 10:21:21 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.71 2021/06/14 10:14:58 riastradh Exp $ */
+/* $NetBSD: pad.c,v 1.72 2021/06/14 10:21:21 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.71 2021/06/14 10:14:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.72 2021/06/14 10:21:21 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -258,6 +258,7 @@ pad_detach(device_t self, int flags)
 
        pmf_device_deregister(sc->sc_dev);
 
+       callout_destroy(&sc->sc_pcallout);
        mutex_destroy(&sc->sc_lock);
        mutex_destroy(&sc->sc_intr_lock);
        cv_destroy(&sc->sc_condvar);



Home | Main Index | Thread Index | Old Index