summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2010-01-02 04:12:07 +0000
committertsutsui <tsutsui@NetBSD.org>2010-01-02 04:12:07 +0000
commit7a44913b3f20ce65b7e41e7991cee92cc9e244c3 (patch)
treedb41e6029fb8db132519d4cce5bd50bd15b8f9ae /sys/dev
parent0fbbcee76fcc134e32a1412f3ad1ccd3c98f8311 (diff)
Fix botches in mechanical changes to make this compile:
dbri.c:165: warning: 'dbri_sus' declared 'static' but never defined dbri.c: In function 'dbri_resume': dbri.c:2188: error: 'sc' undeclared dbri.c:2189: error: break statement not within loop or switch
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sbus/dbri.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/sbus/dbri.c b/sys/dev/sbus/dbri.c
index 5ad4dd1f2b6..8d6e9293ade 100644
--- a/sys/dev/sbus/dbri.c
+++ b/sys/dev/sbus/dbri.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dbri.c,v 1.26 2010/01/02 01:43:42 christos Exp $ */
+/* $NetBSD: dbri.c,v 1.27 2010/01/02 04:12:07 tsutsui Exp $ */
/*
* Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de)
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.26 2010/01/02 01:43:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.27 2010/01/02 04:12:07 tsutsui Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -162,7 +162,6 @@ static void dbri_free(void *, void *, struct malloc_type *);
static paddr_t dbri_mappage(void *, void *, off_t, int);
static void dbri_set_power(struct dbri_softc *, int);
static void dbri_bring_up(struct dbri_softc *);
-static void dbri_sus(int, void *);
static bool dbri_suspend(device_t PMF_FN_PROTO);
static bool dbri_resume(device_t PMF_FN_PROTO);
@@ -2185,8 +2184,10 @@ dbri_suspend(device_t self PMF_FN_ARGS)
static bool
dbri_resume(device_t self PMF_FN_ARGS)
{
+ struct dbri_softc *sc = device_private(self);
+
if (sc->sc_powerstate != 0)
- break;
+ return true;
aprint_verbose("resume: %d\n", sc->sc_refcount);
if (sc->sc_playing) {
volatile uint32_t *cmd;