Merge "wil6210: Move dma mask setting after platform initialization" (53995bb6) · Commits · e / devices / android_kernel_sony_msm8998

drivers/net/wireless/ath/wil6210/pcie_bus.c

+15 −15

Original line number	Diff line number	Diff line
		@@ -212,6 +212,19 @@ static int wil_pcie_probe(struct pci_dev pdev, const struct pci_device_id id)
		return rc;
		}

		wil->pdev = pdev;
		pci_set_drvdata(pdev, wil);
		/* rollback to if_free */

		wil->platform_handle =
		wil_platform_init(&pdev->dev, &wil->platform_ops, &rops, wil);
		if (!wil->platform_handle) {
		rc = -ENODEV;
		wil_err(wil, "wil_platform_init failed\n");
		goto if_free;
		}
		/* rollback to err_plat */

		/* device supports 48bit addresses */
		rc = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48));
		if (rc) {
		@@ -221,25 +234,12 @@ static int wil_pcie_probe(struct pci_dev pdev, const struct pci_device_id id)
		dev_err(dev,
		"dma_set_mask_and_coherent(32) failed: %d\n",
		rc);
		goto if_free;
		goto err_plat;
		}
		} else {
		wil->use_extended_dma_addr = 1;
		}

		wil->pdev = pdev;
		pci_set_drvdata(pdev, wil);
		/* rollback to if_free */

		wil->platform_handle =
		wil_platform_init(&pdev->dev, &wil->platform_ops, &rops, wil);
		if (!wil->platform_handle) {
		rc = -ENODEV;
		wil_err(wil, "wil_platform_init failed\n");
		goto if_free;
		}
		/* rollback to err_plat */

		rc = pci_enable_device(pdev);
		if (rc) {
		wil_err(wil,