Merge remote-tracking branch 'upstream/3.4' into merge-3.4

[platform/upstream/opencv.git] / modules / dnn / src / ocl4dnn / src / ocl4dnn_conv_spatial.cpp

diff --git a/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp b/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
index 3707a31..bf56d3a 100644 (file)
--- a/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
+++ b/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
@@ -1937,7 +1937,7 @@ void OCL4DNNConvSpatial<Dtype>::prepareKernel(const UMat &bottom, UMat &top,
     std::string previous_key = key_;
 
     generateKey();
-    if (key_.compare(previous_key) == 0 && bestKernelConfig != NULL)
+    if (key_.compare(previous_key) == 0 && bestKernelConfig)
         return;
 
     if (bestKernelConfig)