A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "cnss2: Avoid to reject suspend pci for non DRV connected platform"

Browse source
This commit is contained in:
qctecmdr 2021-01-14 07:42:50 -08:00 • committed by Gerrit - the friendly Code Review server
commit 9e542aad4f
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/wireless/cnss2/pci.c
View file

@ -1,5 +1,5 @@
// 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) {