kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scsi: megaraid_sas: fix allocate instance->pd_info twice

Browse source 
fix allocate instance->pd_info twice which was introduced by 96188a89cc.

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>
This commit is contained in:
weiping 2017-08-08 13:15:55 +08:00 committed by Martin K. Petersen
parent d60e9eec95
commit 3b8328e2e0
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/scsi/megaraid/megaraid_sas_base.c
View file

@ -6097,14 +6097,12 @@ static int megasas_probe_one(struct pci_dev *pdev,
instance->pd_info = pci_alloc_consistent(pdev, instance->pd_info = pci_alloc_consistent(pdev,
sizeof(struct MR_PD_INFO), &instance->pd_info_h); 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) if (!instance->pd_info)
dev_err(&instance->pdev->dev, "Failed to alloc mem for pd_info\n"); 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) if (!instance->tgt_prop)
dev_err(&instance->pdev->dev, "Failed to alloc mem for tgt_prop\n"); dev_err(&instance->pdev->dev, "Failed to alloc mem for tgt_prop\n");