Module Name: src
Committed By: isaki
Date: Wed Jun 19 12:52:41 UTC 2019
Modified Files:
src/sys/dev/pad: pad.c
Log Message:
Don't call next callout when an error occurs in start_output.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pad/pad.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.60 src/sys/dev/pad/pad.c:1.61
--- src/sys/dev/pad/pad.c:1.60 Wed Jun 19 12:51:26 2019
+++ src/sys/dev/pad/pad.c Wed Jun 19 12:52:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.60 2019/06/19 12:51:26 isaki Exp $ */
+/* $NetBSD: pad.c,v 1.61 2019/06/19 12:52:41 isaki Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.60 2019/06/19 12:51:26 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.61 2019/06/19 12:52:41 isaki Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -615,12 +615,14 @@ pad_start_output(void *opaque, void *blo
err = pad_add_block(sc, block, blksize);
mutex_exit(&sc->sc_cond_lock);
cv_broadcast(&sc->sc_condvar);
+ if (err)
+ return err;
ms = blksize * 1000 / PADCHAN / (PADPREC / NBBY) / PADFREQ;
DPRINTF("%s: callout ms=%d\n", __func__, ms);
callout_reset(&sc->sc_pcallout, mstohz(ms), pad_done_output, sc);
- return err;
+ return 0;
}
static int
