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

Commit 39132a8d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Fix for WL_EN toggling failure"

parents 739a9864 de744b5e

drivers/net/wireless/cnss2/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ int cnss_bus_dev_shutdown(struct cnss_plat_data *plat_priv) 
	case CNSS_BUS_PCI:

		return cnss_pci_dev_shutdown(plat_priv->bus_priv);

	case CNSS_BUS_USB:

		return 0;

		return cnss_usb_dev_shutdown(plat_priv->bus_priv);

	case CNSS_BUS_SDIO:

		return cnss_sdio_dev_shutdown(plat_priv->bus_priv);

	default:

drivers/net/wireless/cnss2/usb.c

+2 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ int cnss_usb_dev_powerup(struct cnss_plat_data *plat_priv) 
	case QCN7605_STANDALONE_DEVICE_ID:

	case QCN7605_VER20_STANDALONE_DEVICE_ID:

	case QCN7605_VER20_COMPOSITE_DEVICE_ID:

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

			ret = cnss_qcn7605_usb_powerup(plat_priv);

		break;

	default:
@@ -160,7 +161,6 @@ int cnss_usb_unregister_driver_hdlr(struct cnss_usb_data *usb_priv) 
	set_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);

	cnss_usb_dev_shutdown(usb_priv);

	usb_priv->driver_ops = NULL;

	usb_priv->plat_priv = NULL;

	return 0;

}