[Fingerforce-commits] [libfprint] 01/02: imgdev: fix enum mismatch for dev_change_state() call

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch master
in repository libfprint.

commit 9f408bf51b7740e87c3d0b90e5adc5de3c37c052
Author: Timo Teräs <timo.teras at iki.fi>
Date:   Tue Oct 7 08:18:41 2014 +0300

    imgdev: fix enum mismatch for dev_change_state() call
    
    This bug has existed long time, but it was uncovered by commit
    e215b0509448 which enabled multiple enrollment rounds.
    
    In practice this broke (at least) URU4000 driver state machine
    causing it to enter indefinite loop - due to the invalid state
    change callback.
    
    Patch originally posted at:
    http://lists.freedesktop.org/archives/fprint/2014-June/000603.html
    
    Test and verification results:
    http://lists.freedesktop.org/archives/fprint/2014-June/000607.html
    
    Signed-off-by: Timo Teräs <timo.teras at iki.fi>
---
 libfprint/imgdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libfprint/imgdev.c b/libfprint/imgdev.c
index f960ee3..3b5d3f3 100644
--- a/libfprint/imgdev.c
+++ b/libfprint/imgdev.c
@@ -159,7 +159,7 @@ void fpi_imgdev_report_finger_status(struct fp_img_dev *imgdev,
 		    r > 0 && r != FP_ENROLL_COMPLETE && r != FP_ENROLL_FAIL) {
 			imgdev->action_result = 0;
 			imgdev->action_state = IMG_ACQUIRE_STATE_AWAIT_FINGER_ON;
-			dev_change_state(imgdev, IMG_ACQUIRE_STATE_AWAIT_FINGER_ON);
+			dev_change_state(imgdev, IMGDEV_STATE_AWAIT_FINGER_ON);
 		}
 		break;
 	case IMG_ACTION_VERIFY:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/fingerforce/libfprint.git