Module Name: src Committed By: tsutsui Date: Sat Jan 2 04:12:07 UTC 2010
Modified Files: src/sys/dev/sbus: dbri.c Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/sbus/dbri.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/sbus/dbri.c diff -u src/sys/dev/sbus/dbri.c:1.26 src/sys/dev/sbus/dbri.c:1.27 --- src/sys/dev/sbus/dbri.c:1.26 Sat Jan 2 01:43:42 2010 +++ src/sys/dev/sbus/dbri.c Sat Jan 2 04:12:07 2010 @@ -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 (rfkoe...@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 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 @@ 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;