diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-08-05 19:08:42 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-08-05 19:08:42 +0000 |
| commit | 15518a6f4c640a3ef231c948f0d3e77bb3eecee8 (patch) | |
| tree | 2fcaef55216820bf6543f12bc63fae973ab2d1af /sys | |
| parent | c7fc467d280885b148984c9abec5cfe3aaa8a3c0 (diff) | |
Oops, forgot these changes.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/wscons/wsmux.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c index d3e29f3da38..a8913e7ea48 100644 --- a/sys/dev/wscons/wsmux.c +++ b/sys/dev/wscons/wsmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmux.c,v 1.17 2006/08/05 16:59:57 miod Exp $ */ +/* $OpenBSD: wsmux.c,v 1.18 2006/08/05 19:08:41 miod Exp $ */ /* $NetBSD: wsmux.c,v 1.37 2005/04/30 03:47:12 augustss Exp $ */ /* @@ -628,7 +628,7 @@ wsmux_attach_sc(struct wsmux_softc *sc, struct wsevsrc *me) DPRINTF(("wsmux_attach_sc: %s: set display %p\n", sc->sc_base.me_dv.dv_xname, sc->sc_displaydv)); if (me->me_ops->dsetdisplay != NULL) { - error = wsevsrc_set_display(me, &sc->sc_base); + error = wsevsrc_set_display(me, sc->sc_displaydv); /* Ignore that the console already has a display. */ if (error == EBUSY) error = 0; @@ -759,7 +759,6 @@ wsmux_do_displayioctl(struct device *dv, u_long cmd, caddr_t data, int flag, int wsmux_evsrc_set_display(struct device *dv, struct device *displaydv) { - struct wsmux_softc *muxsc = (struct wsmux_softc *)ame; struct wsmux_softc *sc = (struct wsmux_softc *)dv; DPRINTF(("wsmux_set_display: %s: displaydv=%p\n", @@ -801,7 +800,7 @@ wsmux_set_display(struct wsmux_softc *sc, struct device *displaydv) } #endif if (me->me_ops->dsetdisplay != NULL) { - error = wsevsrc_set_display(me, &nsc->sc_base); + error = wsevsrc_set_display(me, nsc->sc_displaydv); DPRINTF(("wsmux_set_display: m=%p dev=%s error=%d\n", me, me->me_dv.dv_xname, error)); if (!error) { |