Merge "soc: qcom: fix null pointer dereference issue" (a92cfc31) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/soc/qcom/cdsprm.c

+25 −25

Original line number	Diff line number	Diff line
		@@ -617,8 +617,7 @@ static void qos_cores_init(struct device *dev)
		dev_err(dev,
		"kcalloc failed for cpucores\n");
		gcdsprm.b_silver_en = false;
		}

		} else {
		for (i = 0; i < gcdsprm.corecount; i++) {
		err = of_property_read_u32_index(dev->of_node,
		"qcom,qos-cores", i, &cpucores[i]);
		@@ -642,6 +641,7 @@ static void qos_cores_init(struct device *dev)
		}
		}
		}
		}

		static void set_qos_latency(int latency)
		{
		@@ -875,11 +875,11 @@ static int process_cdsp_request_thread(void *data)

		msg = &req->msg;

		if ((msg->feature_id == SYSMON_CDSP_FEATURE_RM_RX) &&
		if (msg && (msg->feature_id == SYSMON_CDSP_FEATURE_RM_RX) &&
		gcdsprm.b_qosinitdone) {
		process_rm_request(msg);
		} else if (msg->feature_id ==
		SYSMON_CDSP_FEATURE_L3_RX) {
		} else if (msg && (msg->feature_id ==
		SYSMON_CDSP_FEATURE_L3_RX)) {
		l3_clock_khz = msg->fs.l3_struct.l3_clock_khz;

		spin_lock_irqsave(&gcdsprm.l3_lock, flags);
		@@ -891,8 +891,8 @@ static int process_cdsp_request_thread(void *data)
		pr_debug("Set L3 clock %d done\n",
		l3_clock_khz);
		}
		} else if (msg->feature_id ==
		SYSMON_CDSP_FEATURE_NPU_LIMIT_RX) {
		} else if (msg && (msg->feature_id ==
		SYSMON_CDSP_FEATURE_NPU_LIMIT_RX)) {
		mutex_lock(&gcdsprm.npu_activity_lock);

		gcdsprm.set_corner_limit_cached =
		@@ -936,8 +936,8 @@ static int process_cdsp_request_thread(void *data)
		pr_err("rpmsg send failed %d\n", result);
		else
		pr_debug("NPU limit ack sent\n");
		} else if (msg->feature_id ==
		SYSMON_CDSP_FEATURE_VERSION_RX) {
		} else if (msg && (msg->feature_id ==
		SYSMON_CDSP_FEATURE_VERSION_RX)) {
		cdsprm_rpmsg_send_details();
		pr_debug("Sent preserved data to DSP\n");
		}