2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/crypto/cavium/cpt/cptvf_main.c b/drivers/crypto/cavium/cpt/cptvf_main.c
index aac2966ff8d9..e50872e666d6 100644
--- a/drivers/crypto/cavium/cpt/cptvf_main.c
+++ b/drivers/crypto/cavium/cpt/cptvf_main.c
@@ -815,8 +815,10 @@ static void cptvf_remove(struct pci_dev *pdev)
 {
         struct cpt_vf *cptvf = pci_get_drvdata(pdev);
 
-        if (!cptvf)
+        if (!cptvf) {
                 dev_err(&pdev->dev, "Invalid CPT-VF device\n");
+                return;
+        }
 
         /* Convey DOWN to PF */
         if (cptvf_send_vf_down(cptvf)) {
diff --git a/drivers/crypto/cavium/cpt/cptvf_reqmanager.c b/drivers/crypto/cavium/cpt/cptvf_reqmanager.c
index 7f57f30f8863..169e66231bcf 100644
--- a/drivers/crypto/cavium/cpt/cptvf_reqmanager.c
+++ b/drivers/crypto/cavium/cpt/cptvf_reqmanager.c
@@ -330,8 +330,8 @@ void do_post_process(struct cpt_vf *cptvf, struct cpt_info_buffer *info)
 {
         struct pci_dev *pdev = cptvf->pdev;
 
-        if (!info || !cptvf) {
-                dev_err(&pdev->dev, "Input params are incorrect for post processing\n");
+        if (!info) {
+                dev_err(&pdev->dev, "incorrect cpt_info_buffer for post processing\n");
                 return;
         }