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

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

Merge "Revert "cnss2: Prevent vote for MHI wake after device error""

parents 2f38c2b1 11441d2a

drivers/net/wireless/cnss2/pci.c

+6 −18
Original line number Diff line number Diff line
@@ -1727,7 +1727,6 @@ int cnss_pci_force_wake_request(struct device *dev) 
{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(pci_dev);

	struct cnss_plat_data *plat_priv;

	struct mhi_controller *mhi_ctrl;



	if (!pci_priv)
@@ -1740,14 +1739,9 @@ int cnss_pci_force_wake_request(struct device *dev) 
	if (!mhi_ctrl)

		return -EINVAL;



	plat_priv = pci_priv->plat_priv;

	if (!plat_priv)

		return -ENODEV;



	if (test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state))

		return -EAGAIN;



	mhi_device_get(mhi_ctrl->mhi_dev, MHI_VOTE_DEVICE);

	read_lock_bh(&mhi_ctrl->pm_lock);

	mhi_ctrl->wake_get(mhi_ctrl, true);

	read_unlock_bh(&mhi_ctrl->pm_lock);



	return 0;

}
@@ -1777,7 +1771,6 @@ int cnss_pci_force_wake_release(struct device *dev) 
{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(pci_dev);

	struct cnss_plat_data *plat_priv;

	struct mhi_controller *mhi_ctrl;



	if (!pci_priv)
@@ -1790,14 +1783,9 @@ int cnss_pci_force_wake_release(struct device *dev) 
	if (!mhi_ctrl)

		return -EINVAL;



	plat_priv = pci_priv->plat_priv;

	if (!plat_priv)

		return -ENODEV;



	if (test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state))

		return -EAGAIN;



	mhi_device_put(mhi_ctrl->mhi_dev, MHI_VOTE_DEVICE);

	read_lock_bh(&mhi_ctrl->pm_lock);

	mhi_ctrl->wake_put(mhi_ctrl, false);

	read_unlock_bh(&mhi_ctrl->pm_lock);



	return 0;

}