diff options
author | weiping <zhangweiping@didichuxing.com> | 2017-08-08 01:15:55 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-08-10 19:55:35 -0400 |
commit | 3b8328e2e0fda49202b502154608dd6fb8e8ed37 (patch) | |
tree | 15cb5ff05ece0e7e4369357643a3c58c117e4189 | |
parent | d60e9eec95d2e81253eaf3c39ac8baf4830d0472 (diff) |
scsi: megaraid_sas: fix allocate instance->pd_info twice
fix allocate instance->pd_info twice which was introduced by 96188a89cc6d.
Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 03693c438b67..5202c2fd72ac 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c | |||
@@ -6097,14 +6097,12 @@ static int megasas_probe_one(struct pci_dev *pdev, | |||
6097 | instance->pd_info = pci_alloc_consistent(pdev, | 6097 | instance->pd_info = pci_alloc_consistent(pdev, |
6098 | sizeof(struct MR_PD_INFO), &instance->pd_info_h); | 6098 | sizeof(struct MR_PD_INFO), &instance->pd_info_h); |
6099 | 6099 | ||
6100 | instance->pd_info = pci_alloc_consistent(pdev, | ||
6101 | sizeof(struct MR_PD_INFO), &instance->pd_info_h); | ||
6102 | instance->tgt_prop = pci_alloc_consistent(pdev, | ||
6103 | sizeof(struct MR_TARGET_PROPERTIES), &instance->tgt_prop_h); | ||
6104 | |||
6105 | if (!instance->pd_info) | 6100 | if (!instance->pd_info) |
6106 | dev_err(&instance->pdev->dev, "Failed to alloc mem for pd_info\n"); | 6101 | dev_err(&instance->pdev->dev, "Failed to alloc mem for pd_info\n"); |
6107 | 6102 | ||
6103 | instance->tgt_prop = pci_alloc_consistent(pdev, | ||
6104 | sizeof(struct MR_TARGET_PROPERTIES), &instance->tgt_prop_h); | ||
6105 | |||
6108 | if (!instance->tgt_prop) | 6106 | if (!instance->tgt_prop) |
6109 | dev_err(&instance->pdev->dev, "Failed to alloc mem for tgt_prop\n"); | 6107 | dev_err(&instance->pdev->dev, "Failed to alloc mem for tgt_prop\n"); |
6110 | 6108 | ||