Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce5ce205 authored by Sandeep Singh's avatar Sandeep Singh
Browse files

cnss2: Avoid change to avoid null pointer dereference 



Add change to avoid null pointer dereference.

Change-Id: Ib05b32821a040032358da3fca07a49021e70e536
Signed-off-by: default avatarSandeep Singh <sandsing@codeaurora.org>
parent c59330e7

drivers/net/wireless/cnss2/pci.c

+10 −6
Original line number Diff line number Diff line
@@ -3032,8 +3032,11 @@ int cnss_smmu_map(struct device *dev, 
	if (!test_bit(DISABLE_IO_COHERENCY,

		      &plat_priv->ctrl_params.quirks)) {

		root_port = pci_find_pcie_root_port(pci_priv->pci_dev);

		if (!root_port) {

			cnss_pr_err("Root port is null, so dma_coherent is disabled\n");

		} else {

			root_of_node = root_port->dev.of_node;

		if (root_of_node->parent) {

			if (root_of_node && root_of_node->parent) {

				dma_coherent =

				    of_property_read_bool(root_of_node->parent,

							  "dma-coherent");
@@ -3043,6 +3046,7 @@ int cnss_smmu_map(struct device *dev, 
				flag |= IOMMU_CACHE;

			}

		}

	}



	ret = iommu_map(pci_priv->iommu_domain, iova,

			rounddown(paddr, PAGE_SIZE), len, flag);