mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-17 15:27:36 +00:00
Code Issues Releases Activity

Don't claim the console when the driver is disabled. The getc/putc

Browse Source 
part of the console driver usually works when the driver is disabled,
but the normal read/write part doesn't (it caused a panic).
This commit is contained in:
Bruce Evans 1996-10-09 15:24:21 +00:00
parent b11806da8c
commit 14f3567a32
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=18831
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/syscons/syscons.c
View File

@ -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;
}

2
sys/i386/isa/pcvt/pcvt_drv.c
View File

@ -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;
}

4
sys/i386/isa/syscons.c
View File

@ -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;
}

4
sys/isa/syscons.c
View File

@ -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;
}