From 0e6552a8e0234304acf99c56ac7a76cbf4520eb4 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 7 Sep 2002 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2002-09-07

---
 pc/vgai81x.c  | 1 +
 port/devcap.c | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pc/vgai81x.c b/pc/vgai81x.c
index 6a326d54f0d224c45f2daac88aa8facd787efd3a..ac840fe64980790f5137a3928df13cc7aaea64c6 100644
--- a/pc/vgai81x.c
+++ b/pc/vgai81x.c
@@ -42,6 +42,7 @@ i81xpcimatch(void)
 		case 0x1102:
 		case 0x1112:
 		case 0x1132:
+		case 0x3577:	/* IBM R31 uses intel 830M chipset */
 			return p;
 		}
 	}
diff --git a/port/devcap.c b/port/devcap.c
index ceb3278c89760b0b6917781f6e2678ac6808d752..0a30547636a28e5ba54b462a24f0d83b844a8727 100644
--- a/port/devcap.c
+++ b/port/devcap.c
@@ -92,17 +92,12 @@ capopen(Chan *c, int omode)
 		return c;
 	}
 
-	if(waserror()){
-		qunlock(&capalloc);
-		nexterror();
-	}
 	switch((ulong)c->qid.path){
 	case Qhash:
 		if(!iseve())
 			error(Eperm);
 		break;
 	}
-	poperror();
 
 	c->mode = openmode(omode);
 	c->flag |= COPEN;