Attachment 107453 Details for Bug 84734 – patch

[patch] patch

0001-imgdev-fix-enum-mismatch-for-dev_change_state-call.patch (text/plain), 1.43 KB, created by Timo Teräs on 2014-10-07 05:28:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timo Teräs

Created: 2014-10-07 05:28:35 UTC

Size: 1.43 KB

patch

obsolete

>From 939d2668eafa02117442cfd098e76d4bf21263ee Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
>Date: Tue, 7 Oct 2014 08:18:41 +0300
>Subject: [PATCH] imgdev: fix enum mismatch for dev_change_state() call
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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@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:
>-- 
>2.1.2
>

Actions: View | Splinter Review

Attachments on bug 84734: 107453

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.