Commit 8031b001 authored by Basavaraj Natikar's avatar Basavaraj Natikar Committed by Benjamin Tissoires
Browse files

HID: amd_sfh: Move sensor discovery before HID device initialization 



Sensors discovery is independent of HID device initialization. If sensor
discovery fails after HID initialization, then the HID device needs to be
deinitialized. Therefore, sensors discovery should be moved before HID
device initialization.

Fixes: 7bcfdab3 ("HID: amd_sfh: if no sensors are enabled, clean up")
Tested-by: default avatarAurinko <petrvelicka@tuta.io>
Signed-off-by: default avatarBasavaraj Natikar <Basavaraj.Natikar@amd.com>
Link: https://patch.msgid.link/20240718111616.3012155-1-Basavaraj.Natikar@amd.com


Signed-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent bacc15e0

drivers/hid/amd-sfh-hid/amd_sfh_client.c

+11 −7
Original line number Diff line number Diff line
@@ -288,12 +288,22 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) 
		mp2_ops->start(privdata, info);

		cl_data->sensor_sts[i] = amd_sfh_wait_for_response

						(privdata, cl_data->sensor_idx[i], SENSOR_ENABLED);



		if (cl_data->sensor_sts[i] == SENSOR_ENABLED)

			cl_data->is_any_sensor_enabled = true;

	}



	if (!cl_data->is_any_sensor_enabled ||

	    (mp2_ops->discovery_status && mp2_ops->discovery_status(privdata) == 0)) {

		dev_warn(dev, "Failed to discover, sensors not enabled is %d\n",

			 cl_data->is_any_sensor_enabled);

		rc = -EOPNOTSUPP;

		goto cleanup;

	}



	for (i = 0; i < cl_data->num_hid_devices; i++) {

		cl_data->cur_hid_dev = i;

		if (cl_data->sensor_sts[i] == SENSOR_ENABLED) {

			cl_data->is_any_sensor_enabled = true;

			rc = amdtp_hid_probe(i, cl_data);

			if (rc)

				goto cleanup;
@@ -305,12 +315,6 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) 
			cl_data->sensor_sts[i]);

	}



	if (!cl_data->is_any_sensor_enabled ||

	   (mp2_ops->discovery_status && mp2_ops->discovery_status(privdata) == 0)) {

		dev_warn(dev, "Failed to discover, sensors not enabled is %d\n", cl_data->is_any_sensor_enabled);

		rc = -EOPNOTSUPP;

		goto cleanup;

	}

	schedule_delayed_work(&cl_data->work_buffer, msecs_to_jiffies(AMD_SFH_IDLE_LOOP));

	return 0;