diff --git a/libgo/go/net/fd_select.go b/libgo/go/net/fd_select.go
index b9544e96c754..39c8f2777b28 100644
--- a/libgo/go/net/fd_select.go
+++ b/libgo/go/net/fd_select.go
@@ -85,7 +85,8 @@ func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err erro
 			timeout = &tv
 		}
 
-		var n, e int
+		var n int
+		var e error
 		var tmpReadFds, tmpWriteFds syscall.FdSet
 		for {
 			// Temporary syscall.FdSet's into which the values are copied
@@ -101,7 +102,7 @@ func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err erro
 				break
 			}
 		}
-		if e != 0 {
+		if e != nil {
 			return -1, 0, os.NewSyscallError("select", e)
 		}
 		if n == 0 {
diff --git a/libgo/go/os/sys_uname.go b/libgo/go/os/sys_uname.go
index 0e68647acdcb..313ee62aef60 100644
--- a/libgo/go/os/sys_uname.go
+++ b/libgo/go/os/sys_uname.go
@@ -10,7 +10,7 @@ import "syscall"
 
 func Hostname() (name string, err error) {
 	var u syscall.Utsname
-	if errno := syscall.Uname(&u); errno != 0 {
+	if errno := syscall.Uname(&u); errno != nil {
 		return "", NewSyscallError("uname", errno)
 	}
 	b := make([]byte, len(u.Nodename))