Merge "cnss2: Use separate DT entry to add firmware path prefix" (a16d8feb) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/wireless/cnss2/main.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -2955,8 +2955,10 @@ static void cnss_get_wlaon_pwr_ctrl_info(struct cnss_plat_data *plat_priv)

		static bool cnss_use_fw_path_with_prefix(struct cnss_plat_data *plat_priv)
		{
		return of_property_read_bool(plat_priv->plat_dev->dev.of_node,
		"qcom,converged-dt");
		return (of_property_read_bool(plat_priv->plat_dev->dev.of_node,
		"qcom,converged-dt") \|\|
		of_property_read_bool(plat_priv->plat_dev->dev.of_node,
		"qcom,same-dt-multi-dev"));
		}

		static const struct platform_device_id cnss_platform_id_table[] = {