[src/netbsd-2-0]: src/sys/dev/pci Pullup rev 1.36 (requested by kent in ticke...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c854721fe6c2
branches:  netbsd-2-0
changeset: 562694:c854721fe6c2
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Sep 22 20:58:30 2004 +0000

description:
Pullup rev 1.36 (requested by kent in ticket #867)

ac97_host_if::reset() returns non-zero value if codec reset fails, and
ac97 is not attached in that case. PR#26973

diffstat:

 sys/dev/pci/emuxki.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r cd65ec5035f2 -r c854721fe6c2 sys/dev/pci/emuxki.c
--- a/sys/dev/pci/emuxki.c      Wed Sep 22 20:58:27 2004 +0000
+++ b/sys/dev/pci/emuxki.c      Wed Sep 22 20:58:30 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emuxki.c,v 1.31.2.1 2004/04/05 20:29:50 tron Exp $     */
+/*     $NetBSD: emuxki.c,v 1.31.2.2 2004/09/22 20:58:30 jmc Exp $      */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.31.2.1 2004/04/05 20:29:50 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.31.2.2 2004/09/22 20:58:30 jmc Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -171,7 +171,7 @@
 static int  emuxki_ac97_attach(void *, struct ac97_codec_if *);
 static int  emuxki_ac97_read(void *, u_int8_t, u_int16_t *);
 static int  emuxki_ac97_write(void *, u_int8_t, u_int16_t);
-static void emuxki_ac97_reset(void *);
+static int  emuxki_ac97_reset(void *);
 static enum ac97_host_flags emuxki_ac97_flags(void *);
 
 /*
@@ -2236,9 +2236,10 @@
        return (0);
 }
 
-static void
+static int
 emuxki_ac97_reset(void *arg)
 {
+       return 0;
 }
 
 enum ac97_host_flags