Commit 19b60acc authored by Basavaraj Natikar's avatar Basavaraj Natikar Committed by Jiri Kosina
Browse files

HID: amd_sfh: Split sensor and HID initialization for SFH1.1 



Sensors are enabled independently of HID device initialization. Sensor
initialization should be kept separate in this case, while HID devices
should be initialized according to the sensor state. Hence split sensor
initialization and HID initialization for SFH1.1 into separate blocks.

Signed-off-by: default avatarBasavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent c0709c6c

drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c

+5 −5
Original line number Diff line number Diff line
@@ -168,16 +168,16 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) 
		status = amd_sfh_wait_for_response

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



		status = (status == 0) ? SENSOR_ENABLED : SENSOR_DISABLED;

		cl_data->sensor_sts[i] = (status == 0) ? SENSOR_ENABLED : SENSOR_DISABLED;

	}



		if (status == SENSOR_ENABLED) {

	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;

			cl_data->sensor_sts[i] = SENSOR_ENABLED;

			rc = amdtp_hid_probe(i, cl_data);

			if (rc)

				goto cleanup;

		} else {

			cl_data->sensor_sts[i] = SENSOR_DISABLED;

		}

		dev_dbg(dev, "sid 0x%x (%s) status 0x%x\n",

			cl_data->sensor_idx[i], get_sensor_name(cl_data->sensor_idx[i]),