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

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

Merge "cnss2: Add an option to skip booting device during driver probe"

parents 37dfad24 fb878ddd
Loading
Loading
Loading
Loading
+13 −8
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ MODULE_PARM_DESC(enable_waltest, "Enable to handle firmware waltest");

enum cnss_debug_quirks {
	LINK_DOWN_SELF_RECOVERY,
	SKIP_DEVICE_BOOT,
};

unsigned long quirks;
@@ -2232,6 +2233,7 @@ static int cnss_probe(struct platform_device *plat_dev)
	if (ret)
		goto reset_ctx;

	if (!test_bit(SKIP_DEVICE_BOOT, &quirks)) {
		ret = cnss_power_on_device(plat_priv);
		if (ret)
			goto free_res;
@@ -2239,6 +2241,7 @@ static int cnss_probe(struct platform_device *plat_dev)
		ret = cnss_pci_init(plat_priv);
		if (ret)
			goto power_off;
	}

	ret = cnss_register_esoc(plat_priv);
	if (ret)
@@ -2291,8 +2294,10 @@ unreg_bus_scale:
unreg_esoc:
	cnss_unregister_esoc(plat_priv);
deinit_pci:
	if (!test_bit(SKIP_DEVICE_BOOT, &quirks))
		cnss_pci_deinit(plat_priv);
power_off:
	if (!test_bit(SKIP_DEVICE_BOOT, &quirks))
		cnss_power_off_device(plat_priv);
free_res:
	cnss_put_resources(plat_priv);