diff --git a/cmd/main.go b/cmd/main.go
index e41abfe773..3579f23350 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -108,7 +108,7 @@ func main() {
 			klog.ErrorS(err, "failed to get version")
 			klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 		}
-		//nolint:forbidigo
+		//nolint:forbidigo // Print version info without klog/timestamp
 		fmt.Println(versionInfo)
 		os.Exit(0)
 	}
diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
index dc4e0ef081..352cc278c2 100644
--- a/pkg/driver/controller.go
+++ b/pkg/driver/controller.go
@@ -486,11 +486,11 @@ func (d *ControllerService) ControllerGetCapabilities(ctx context.Context, req *
 	klog.V(4).InfoS("ControllerGetCapabilities: called", "args", req)
 
 	caps := make([]*csi.ControllerServiceCapability, 0, len(controllerCaps))
-	for _, cap := range controllerCaps {
+	for _, capability := range controllerCaps {
 		c := &csi.ControllerServiceCapability{
 			Type: &csi.ControllerServiceCapability_Rpc{
 				Rpc: &csi.ControllerServiceCapability_RPC{
-					Type: cap,
+					Type: capability,
 				},
 			},
 		}