Merge "cnss2: Use correct QMI instance ID" (d3a3790f) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/net/wireless/cnss2/bus.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ enum cnss_dev_bus_type cnss_get_bus_type(unsigned long device_id)
		case QCA6174_DEVICE_ID:
		case QCA6290_EMULATION_DEVICE_ID:
		case QCA6290_DEVICE_ID:
		case QCA6390_DEVICE_ID:
		return CNSS_BUS_PCI;
		default:
		cnss_pr_err("Unknown device_id: 0x%lx\n", device_id);

+5 −2

Original line number	Diff line number	Diff line
		@@ -1327,14 +1327,17 @@ int cnss_qmi_init(struct cnss_plat_data *plat_priv)
		ret = qmi_handle_init(&plat_priv->qmi_wlfw,
		QMI_WLFW_MAX_RECV_BUF_SIZE,
		&qmi_wlfw_ops, qmi_wlfw_msg_handlers);
		if (ret < 0)
		if (ret < 0) {
		cnss_pr_err("Failed to initialize QMI handle, err: %d\n", ret);
		goto out;
		}

		ret = qmi_add_lookup(&plat_priv->qmi_wlfw, WLFW_SERVICE_ID_V01,
		WLFW_SERVICE_VERS_V01, 0);
		WLFW_SERVICE_VERS_V01, WLFW_SERVICE_INS_ID_V01);
		if (ret < 0)
		cnss_pr_err("Failed to add QMI lookup, err: %d\n", ret);

		out:
		return ret;
		}