diff options
| author | bde <bde@FreeBSD.org> | 1996-10-09 15:24:21 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-10-09 15:24:21 +0000 |
| commit | e8d192466fe3f005269f06023c54296407ae002f (patch) | |
| tree | fd5ec2a8e0ebd68d7b5294d02e298aaf2da88f00 | |
| parent | b3eb03e7b20f86e4b1db6d6d331ca84589f0aaab (diff) | |
| download | FreeBSD-src-e8d192466fe3f005269f06023c54296407ae002f.zip FreeBSD-src-e8d192466fe3f005269f06023c54296407ae002f.tar.gz | |
Don't claim the console when the driver is disabled. The getc/putc
part of the console driver usually works when the driver is disabled,
but the normal read/write part doesn't (it caused a panic).
| -rw-r--r-- | sys/dev/syscons/syscons.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_drv.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/syscons.c | 4 | ||||
| -rw-r--r-- | sys/isa/syscons.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index c371dd5..b75bf45 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.176 1996/10/02 22:00:38 sos Exp $ + * $Id: syscons.c,v 1.177 1996/10/03 00:42:27 jkh Exp $ */ #include "sc.h" @@ -1322,7 +1322,7 @@ sccnprobe(struct consdev *cp) * Take control if we are the highest priority enabled display device. */ dvp = find_display(); - if (dvp != NULL && dvp->id_driver != &scdriver) { + if (dvp == NULL || dvp->id_driver != &scdriver) { cp->cn_pri = CN_DEAD; return; } diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c index 5ff22b7..3b216f0 100644 --- a/sys/i386/isa/pcvt/pcvt_drv.c +++ b/sys/i386/isa/pcvt/pcvt_drv.c @@ -1073,7 +1073,7 @@ pccnprobe(struct consdev *cp) * Take control if we are the highest priority enabled display device. */ dvp = find_display(); - if (dvp != NULL && dvp->id_driver != &vtdriver) { + if (dvp == NULL || dvp->id_driver != &vtdriver) { cp->cn_pri = CN_DEAD; return; } diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index c371dd5..b75bf45 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.176 1996/10/02 22:00:38 sos Exp $ + * $Id: syscons.c,v 1.177 1996/10/03 00:42:27 jkh Exp $ */ #include "sc.h" @@ -1322,7 +1322,7 @@ sccnprobe(struct consdev *cp) * Take control if we are the highest priority enabled display device. */ dvp = find_display(); - if (dvp != NULL && dvp->id_driver != &scdriver) { + if (dvp == NULL || dvp->id_driver != &scdriver) { cp->cn_pri = CN_DEAD; return; } diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index c371dd5..b75bf45 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.176 1996/10/02 22:00:38 sos Exp $ + * $Id: syscons.c,v 1.177 1996/10/03 00:42:27 jkh Exp $ */ #include "sc.h" @@ -1322,7 +1322,7 @@ sccnprobe(struct consdev *cp) * Take control if we are the highest priority enabled display device. */ dvp = find_display(); - if (dvp != NULL && dvp->id_driver != &scdriver) { + if (dvp == NULL || dvp->id_driver != &scdriver) { cp->cn_pri = CN_DEAD; return; } |
