depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

elan: ELAN_0C42 always supports calibration

Browse source 
Split off calibration support checks into elan_supports_calibration()
This commit is contained in:
Dave 2019-04-09 02:29:32 -04:00 committed by Bastien Nocera
parent ce31c1d704
commit 83af40679a
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libfprint/drivers/elan.c
View file

@ -627,6 +627,14 @@ enum calibrate_states {
CALIBRATE_NUM_STATES, CALIBRATE_NUM_STATES,
}; };
static gboolean elan_supports_calibration(struct elan_dev *elandev)
{
if (elandev->dev_type == ELAN_0C42)
return TRUE;
return elandev->fw_ver >= ELAN_MIN_CALIBRATION_FW;
}
static void calibrate_run_state(fpi_ssm *ssm, struct fp_dev *_dev, void *user_data) static void calibrate_run_state(fpi_ssm *ssm, struct fp_dev *_dev, void *user_data)
{ {
struct fp_img_dev *dev = user_data; struct fp_img_dev *dev = user_data;
@ -640,7 +648,7 @@ static void calibrate_run_state(fpi_ssm *ssm, struct fp_dev *_dev, void *user_da
break; break;
case CALIBRATE_SAVE_BACKGROUND: case CALIBRATE_SAVE_BACKGROUND:
elan_save_background(elandev); elan_save_background(elandev);
if (elandev->fw_ver < ELAN_MIN_CALIBRATION_FW) { if (!elan_supports_calibration(elandev)) {
fp_dbg("FW does not support calibration"); fp_dbg("FW does not support calibration");
fpi_ssm_mark_completed(ssm); fpi_ssm_mark_completed(ssm);
} else } else