From: weiping Date: Tue, 8 Aug 2017 05:15:55 +0000 (+0800) Subject: scsi: megaraid_sas: fix allocate instance->pd_info twice X-Git-Tag: v4.1.12-124.31.3~1069 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e184172a2deba46f2af60c7587d88de4c33e31f7;p=users%2Fjedix%2Flinux-maple.git 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 Acked-by: Sumit Saxena Signed-off-by: Martin K. Petersen Orabug: 27625001 Signed-off-by: Jack Vogel Reviewed-by: Martin K. Petersen --- diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 19137cdc4f66..f17c10109778 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -6125,14 +6125,12 @@ static int megasas_probe_one(struct pci_dev *pdev, instance->pd_info = pci_alloc_consistent(pdev, sizeof(struct MR_PD_INFO), &instance->pd_info_h); - instance->pd_info = pci_alloc_consistent(pdev, - sizeof(struct MR_PD_INFO), &instance->pd_info_h); - instance->tgt_prop = pci_alloc_consistent(pdev, - sizeof(struct MR_TARGET_PROPERTIES), &instance->tgt_prop_h); - if (!instance->pd_info) dev_err(&instance->pdev->dev, "Failed to alloc mem for pd_info\n"); + instance->tgt_prop = pci_alloc_consistent(pdev, + sizeof(struct MR_TARGET_PROPERTIES), &instance->tgt_prop_h); + if (!instance->tgt_prop) dev_err(&instance->pdev->dev, "Failed to alloc mem for tgt_prop\n");