Don't use an uninitialised softc pointer in midiread/midiwrite.

ok ratchov@

diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index 16235f2..709368f 100644 (file)
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: midi.c,v 1.39 2015/05/16 09:56:10 ratchov Exp $       */
+/*     $OpenBSD: midi.c,v 1.40 2015/05/22 12:52:00 jsg Exp $   */
 
 /*
  * Copyright (c) 2003, 2004 Alexandre Ratchov
@@ -107,7 +107,7 @@ int
 midiread(dev_t dev, struct uio *uio, int ioflag)
 {
        struct midi_softc *sc;
-       struct midi_buffer *mb = &sc->inbuf;
+       struct midi_buffer *mb;
        size_t count;
        int error;
 
@@ -118,6 +118,7 @@ midiread(dev_t dev, struct uio *uio, int ioflag)
                error = ENXIO;
                goto done;
        }
+       mb = &sc->inbuf;
 
        /* if there is no data then sleep (unless IO_NDELAY flag is set) */
        error = 0;
@@ -240,7 +241,7 @@ int
 midiwrite(dev_t dev, struct uio *uio, int ioflag)
 {
        struct midi_softc *sc;
-       struct midi_buffer *mb = &sc->outbuf;
+       struct midi_buffer *mb;
        size_t count;
        int error;
 
@@ -251,6 +252,7 @@ midiwrite(dev_t dev, struct uio *uio, int ioflag)
                error = ENXIO;
                goto done;
        }
+       mb = &sc->outbuf;
 
        /*
         * If IO_NDELAY flag is set then check if there is enough room