summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2015-12-23 12:45:06 +0000
committerjmcneill <jmcneill@NetBSD.org>2015-12-23 12:45:06 +0000
commit81e03b10626bce691e63da9d554b453dbb9190dc (patch)
treee3705eed35608e4ecc3060210a234166ff0b0d0d /sys/dev
parent9939e36ed745a31e017fe619c4bdbae678750159 (diff)
get rid of HDAUDIO_FLAG_NO_STREAM_RESET hack
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/hdaudio/hdaudio.c7
-rw-r--r--sys/dev/hdaudio/hdaudiovar.h5
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/dev/hdaudio/hdaudio.c b/sys/dev/hdaudio/hdaudio.c
index 9daeb426532..cfe6255db83 100644
--- a/sys/dev/hdaudio/hdaudio.c
+++ b/sys/dev/hdaudio/hdaudio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.3 2015/07/26 17:54:33 jmcneill Exp $ */
+/* $NetBSD: hdaudio.c,v 1.4 2015/12/23 12:45:06 jmcneill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.3 2015/07/26 17:54:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.4 2015/12/23 12:45:06 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1215,8 +1215,7 @@ hdaudio_stream_start(struct hdaudio_stream *st, int blksize,
KASSERT(st->st_bdl.dma_valid == true);
hdaudio_stream_stop(st);
- if ((sc->sc_flags & HDAUDIO_FLAG_NO_STREAM_RESET) == 0)
- hdaudio_stream_reset(st);
+ hdaudio_stream_reset(st);
/*
* Configure buffer descriptor list
diff --git a/sys/dev/hdaudio/hdaudiovar.h b/sys/dev/hdaudio/hdaudiovar.h
index b3806e633af..9b766fac6b5 100644
--- a/sys/dev/hdaudio/hdaudiovar.h
+++ b/sys/dev/hdaudio/hdaudiovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudiovar.h,v 1.4 2015/07/26 17:54:33 jmcneill Exp $ */
+/* $NetBSD: hdaudiovar.h,v 1.5 2015/12/23 12:45:06 jmcneill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk>
@@ -157,9 +157,6 @@ struct hdaudio_softc {
struct hdaudio_stream sc_stream[HDAUDIO_MAX_STREAMS];
uint32_t sc_stream_mask;
kmutex_t sc_stream_mtx;
-
- uint32_t sc_flags;
-#define HDAUDIO_FLAG_NO_STREAM_RESET 0x0001
};
int hdaudio_attach(device_t, struct hdaudio_softc *);