golangci-lint pass number 2

clean up and prepare to migrate to the golangci-linter

Signed-off-by: baude <bbaude@redhat.com>

pkg/adapter/terminal_linux.go

@@ -39,7 +39,11 @@ func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr,
 			return err
 		}
 
-		defer restoreTerminal(oldTermState)
+		defer func() {
+			if err := restoreTerminal(oldTermState); err != nil {
+				logrus.Errorf("unable to restore terminal: %q", err)
+			}
+		}()
 	}
 
 	streams := new(libpod.AttachStreams)