cancel start or parameter return good

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 51a979fdfaaf55cf73717ec67b625393733be931..602b5ed0f3d469b03afc41c74d306c4040faa31e 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -128,7 +128,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
        handler* h = (handler*) handle;
 
        if (h->read_info->cancel)
-               return SANE_STATUS_CANCELLED;
+               return SANE_STATUS_GOOD;
 
        params->format = h->current_metadata->format;
        params->last_frame = h->current_metadata->is_last;
@@ -164,7 +164,7 @@ SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle)
        }
 
        if (h->read_info->cancel)
-               return SANE_STATUS_CANCELLED;
+               return SANE_STATUS_GOOD;
 
        for (int i = 0; i < 200; i++) {
                usleep(500000);

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 3107ff28961b43df9fe7dd7e3e3cf1d591f51528..bac356adcf20314336a7c2c96c16c2809f4331fb 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -534,7 +534,7 @@ void sane_kds_s2000w_net_start_cancel()
        SANE_Status status = _sane_kds_s2000w_net_start(h);
 
        assert_int_equal(h->read_info->cancel, 1);
-       assert_int_equal(status, SANE_STATUS_CANCELLED);
+       assert_int_equal(status, SANE_STATUS_GOOD);
 
        free_handler(h);
        h = NULL;
@@ -868,7 +868,7 @@ void sane_kds_s2000w_net_get_parameter_cancel()
        SANE_Status status = _sane_kds_s2000w_net_get_parameters(h, NULL);
 
        assert_int_equal(h->read_info->cancel, 1);
-       assert_int_equal(status, SANE_STATUS_CANCELLED);
+       assert_int_equal(status, SANE_STATUS_GOOD);
 
        free_handler(h);
        h = NULL;