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

Commit ddf7db4c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Avoid checking PCIe status in IRQ or IRQ disable context"

parents 2171516a 9fa22520

drivers/net/wireless/cnss2/pci.c

+10 −6
Original line number Diff line number Diff line
@@ -396,9 +396,11 @@ static int cnss_pci_reg_read(struct cnss_pci_data *pci_priv, 
{

	int ret;



	if (!in_interrupt() && !irqs_disabled()) {

		ret = cnss_pci_check_link_status(pci_priv);

		if (ret)

			return ret;

	}



	if (pci_priv->pci_dev->device == QCA6174_DEVICE_ID ||

	    offset < MAX_UNWINDOWED_ADDRESS) {
@@ -421,9 +423,11 @@ static int cnss_pci_reg_write(struct cnss_pci_data *pci_priv, u32 offset, 
{

	int ret;



	if (!in_interrupt() && !irqs_disabled()) {

		ret = cnss_pci_check_link_status(pci_priv);

		if (ret)

			return ret;

	}



	if (pci_priv->pci_dev->device == QCA6174_DEVICE_ID ||

	    offset < MAX_UNWINDOWED_ADDRESS) {