* [PATCH v2] scsi: megaraid_sas: fix allocate instance->pd_info twice
@ 2017-08-08 5:15 weiping zhang
2017-08-08 14:06 ` Sumit Saxena
2017-08-11 0:05 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: weiping zhang @ 2017-08-08 5:15 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara
Cc: megaraidlinux.pdl, linux-scsi
fix allocate instance->pd_info twice which was introduced by 96188a89cc6d.
Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
---
drivers/scsi/megaraid/megaraid_sas_base.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 71c4746..a0f057c 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -6096,14 +6096,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");
--
2.9.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH v2] scsi: megaraid_sas: fix allocate instance->pd_info twice
2017-08-08 5:15 [PATCH v2] scsi: megaraid_sas: fix allocate instance->pd_info twice weiping zhang
@ 2017-08-08 14:06 ` Sumit Saxena
2017-08-11 0:05 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Sumit Saxena @ 2017-08-08 14:06 UTC (permalink / raw)
To: weiping zhang, Kashyap Desai, Shivasharan Srikanteshwara
Cc: PDL,MEGARAIDLINUX, linux-scsi
>-----Original Message-----
>From: weiping zhang [mailto:zhangweiping@didichuxing.com]
>Sent: Tuesday, August 08, 2017 10:46 AM
>To: kashyap.desai@broadcom.com; sumit.saxena@broadcom.com;
>shivasharan.srikanteshwara@broadcom.com
>Cc: megaraidlinux.pdl@broadcom.com; linux-scsi@vger.kernel.org
>Subject: [PATCH v2] 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>
>---
> drivers/scsi/megaraid/megaraid_sas_base.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c
>b/drivers/scsi/megaraid/megaraid_sas_base.c
>index 71c4746..a0f057c 100644
>--- a/drivers/scsi/megaraid/megaraid_sas_base.c
>+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
>@@ -6096,14 +6096,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");
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
>
>--
>2.9.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] scsi: megaraid_sas: fix allocate instance->pd_info twice
2017-08-08 5:15 [PATCH v2] scsi: megaraid_sas: fix allocate instance->pd_info twice weiping zhang
2017-08-08 14:06 ` Sumit Saxena
@ 2017-08-11 0:05 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2017-08-11 0:05 UTC (permalink / raw)
To: weiping zhang
Cc: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara,
megaraidlinux.pdl, linux-scsi
weiping,
> fix allocate instance->pd_info twice which was introduced by
> 96188a89cc6d.
Applied to 4.14/scsi-queue, thank you!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-11 0:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-08 5:15 [PATCH v2] scsi: megaraid_sas: fix allocate instance->pd_info twice weiping zhang
2017-08-08 14:06 ` Sumit Saxena
2017-08-11 0:05 ` Martin K. Petersen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.