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

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

Merge "cnss2: Clear device error flag at the end of shutdown process"

parents 745f643d e311c4a0

drivers/net/wireless/cnss2/pci.c

+3 −2
Original line number Diff line number Diff line
@@ -1041,7 +1041,6 @@ int cnss_pci_call_driver_remove(struct cnss_pci_data *pci_priv) 
	} else if (test_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state)) {

		pci_priv->driver_ops->remove(pci_priv->pci_dev);

		clear_bit(CNSS_DRIVER_PROBED, &plat_priv->driver_state);

		clear_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);

	} else if (test_bit(CNSS_DRIVER_IDLE_SHUTDOWN,

			    &plat_priv->driver_state)) {

		ret = pci_priv->driver_ops->idle_shutdown(pci_priv->pci_dev);
@@ -1050,7 +1049,6 @@ int cnss_pci_call_driver_remove(struct cnss_pci_data *pci_priv) 
				  &plat_priv->driver_state);

			return ret;

		}

		clear_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);

	}



	return 0;
@@ -1336,6 +1334,9 @@ static int cnss_qca6290_shutdown(struct cnss_pci_data *pci_priv) 


	clear_bit(CNSS_FW_READY, &plat_priv->driver_state);

	clear_bit(CNSS_FW_MEM_READY, &plat_priv->driver_state);

	if (test_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state) ||

	    test_bit(CNSS_DRIVER_IDLE_SHUTDOWN, &plat_priv->driver_state))

		clear_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);

	clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);

	clear_bit(CNSS_DRIVER_IDLE_SHUTDOWN, &plat_priv->driver_state);