* [PATCH -next] fpga: dfl: pci: Make sure DMA related error check is not done twice
@ 2022-03-01 2:43 Yusuf Khan
0 siblings, 0 replies; only message in thread
From: Yusuf Khan @ 2022-03-01 2:43 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-fpga, yilun.xu, mdf, trix, hao.wu, Yusuf Khan
In the case that the DMA 64 bit bit mask error check does not fail,
the error check will be done twice, this patch fixed that.
Signed-off-by: Yusuf Khan <yusisamerican@gmail.com>
---
drivers/fpga/dfl-pci.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c
index 717ac9715970..6222f18aed4b 100644
--- a/drivers/fpga/dfl-pci.c
+++ b/drivers/fpga/dfl-pci.c
@@ -356,11 +356,12 @@ int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid)
pci_set_master(pcidev);
ret = dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(64));
- if (ret)
- ret = dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(32));
if (ret) {
- dev_err(&pcidev->dev, "No suitable DMA support available.\n");
- goto disable_error_report_exit;
+ ret = dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(32));
+ if (ret) {
+ dev_err(&pcidev->dev, "No suitable DMA support available.\n");
+ goto disable_error_report_exit;
+ }
}
ret = cci_init_drvdata(pcidev);
--
2.25.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-03-01 2:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-01 2:43 [PATCH -next] fpga: dfl: pci: Make sure DMA related error check is not done twice Yusuf Khan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®