Merge "cnss2: Avoid to reject suspend pci for non DRV connected platform" (9e542aad) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/wireless/cnss2/pci.c

+5 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. */
		/* Copyright (c) 2016-2021, The Linux Foundation. All rights reserved. */

		#include <linux/cma.h>
		#include <linux/firmware.h>
		@@ -2843,7 +2843,8 @@ static int cnss_pci_suspend(struct device *dev)
		if (!cnss_is_device_powered_on(plat_priv))
		goto out;

		if (!test_bit(DISABLE_DRV, &plat_priv->ctrl_params.quirks)) {
		if (!test_bit(DISABLE_DRV, &plat_priv->ctrl_params.quirks) &&
		cnss_pci_get_drv_connected(pci_priv)) {
		pci_priv->drv_connected_last =
		cnss_pci_get_drv_connected(pci_priv);
		if (!pci_priv->drv_connected_last) {
		@@ -2985,7 +2986,8 @@ static int cnss_pci_runtime_suspend(struct device *dev)
		return -EAGAIN;
		}

		if (!test_bit(DISABLE_DRV, &plat_priv->ctrl_params.quirks)) {
		if (!test_bit(DISABLE_DRV, &plat_priv->ctrl_params.quirks) &&
		cnss_pci_get_drv_connected(pci_priv)) {
		pci_priv->drv_connected_last =
		cnss_pci_get_drv_connected(pci_priv);
		if (!pci_priv->drv_connected_last) {