diff options
| -rw-r--r-- | common/fpsensor/fpsensor.c | 5 | ||||
| -rw-r--r-- | driver/fingerprint/fpc/fpc_sensor.c | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/common/fpsensor/fpsensor.c b/common/fpsensor/fpsensor.c index 035dc7da5a..01a6157cda 100644 --- a/common/fpsensor/fpsensor.c +++ b/common/fpsensor/fpsensor.c @@ -830,10 +830,13 @@ int command_fpclear(int argc, char **argv) DECLARE_CONSOLE_COMMAND(fpclear, command_fpclear, NULL, "Clear fingerprint sensor context"); - int command_fpmaintenance(int argc, char **argv) { +#ifdef HAVE_FP_PRIVATE_DRIVER return fp_maintenance(); +#else + return EC_SUCCESS; +#endif /* #ifdef HAVE_FP_PRIVATE_DRIVER */ } DECLARE_CONSOLE_COMMAND(fpmaintenance, command_fpmaintenance, NULL, "Run fingerprint sensor maintenance"); diff --git a/driver/fingerprint/fpc/fpc_sensor.c b/driver/fingerprint/fpc/fpc_sensor.c index 92a3db51c9..a15502521f 100644 --- a/driver/fingerprint/fpc/fpc_sensor.c +++ b/driver/fingerprint/fpc/fpc_sensor.c @@ -14,7 +14,15 @@ #else #error "Sensor type not defined!" #endif -#include "fpc_sensor.h" + +/* + * TODO(b/164174822): We cannot include fpc_sensor.h here, since + * the parent fpsensor.h header conditionally excludes fpc_sensor.h + * and replaces its content with default macros. + * Fix this header discrepancy. + * + * #include "fpc_sensor.h" + */ int fpc_fp_maintenance(uint16_t *error_state) { |