merge

2 files changed, 5 insertions, 3 deletions

diff --git a/sys/src/9/zynq/screen.c b/sys/src/9/zynq/screen.c
index 0b1affce2..c65a1e0ae 100644
--- a/sys/src/9/zynq/screen.c
+++ b/sys/src/9/zynq/screen.c
@@ -41,7 +41,10 @@ setcursor(Cursor*)
 void
 flushmemscreen(Rectangle r)
 {
-	combinerect(&fbscreen.rect, r);
+	if(badrect(fbscreen.rect))
+		fbscreen.rect = r;
+	else
+		combinerect(&fbscreen.rect, r);
 	wakeup(&fbscreen);
 }
 
@@ -117,7 +120,6 @@ flushproc(void *arg)
 
 	fbscreen.proc = up;
 	if(waserror()){
-		print("flushproc: %s\n", up->errstr);
 		fbscreen.addr = 0;
 		fbscreen.proc = nil;
 		return;
diff --git a/sys/src/cmd/ip/cifsd/smb.c b/sys/src/cmd/ip/cifsd/smb.c
index 9e6f9cf3c..47e065c32 100644
--- a/sys/src/cmd/ip/cifsd/smb.c
+++ b/sys/src/cmd/ip/cifsd/smb.c
@@ -659,7 +659,7 @@ smbrename(Req *r, uchar *h, uchar *p, uchar *e)
 		r->respond(r, smbmkerror());
 		goto out;
 	}
-	if(!matchattr(d, sattr) || (dosfileattr(d) & ATTR_READONLY)){
+	if(!matchattr(d, sattr)){
 		r->respond(r, STATUS_NO_SUCH_FILE);
 		goto out;
 	}