]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
megaraid: fix null pointer check in megasas_detach_one().
authorMaurizio Lombardi <mlombard@redhat.com>
Fri, 22 Jan 2016 12:41:42 +0000 (13:41 +0100)
committerChuck Anderson <chuck.anderson@oracle.com>
Wed, 16 Mar 2016 13:37:51 +0000 (06:37 -0700)
Orabug: 22620626

The pd_seq_sync pointer can't be NULL, we have to check its entries
instead.

Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 546e559c79b1a8d27c23262907a00fc209e392a0)
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/megaraid/megaraid_sas_base.c

index b5a3aac7e72e79a7b28371e305abf3a9c3b54a6f..96d5726b725b449b3e384b99927c05a792d9523d 100644 (file)
@@ -6317,11 +6317,11 @@ static void megasas_detach_one(struct pci_dev *pdev)
                        if (fusion->ld_drv_map[i])
                                free_pages((ulong)fusion->ld_drv_map[i],
                                        fusion->drv_map_pages);
-                               if (fusion->pd_seq_sync)
-                                       dma_free_coherent(&instance->pdev->dev,
-                                               pd_seq_map_sz,
-                                               fusion->pd_seq_sync[i],
-                                               fusion->pd_seq_phys[i]);
+                       if (fusion->pd_seq_sync[i])
+                               dma_free_coherent(&instance->pdev->dev,
+                                       pd_seq_map_sz,
+                                       fusion->pd_seq_sync[i],
+                                       fusion->pd_seq_phys[i]);
                }
                free_pages((ulong)instance->ctrl_context,
                        instance->ctrl_context_pages);