summaryrefslogtreecommitdiff
path: root/backend/kvs40xx.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-02-12 17:35:53 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-02-12 17:35:53 +0100
commit84357741a6a6e6430f199b2c3f7498e0e97da9ad (patch)
tree23e8d66ede9506b94c76fb36910ca3c7dd15c74e /backend/kvs40xx.c
parent302276dc1b90cfc972fb726ca94a23b18f4b0088 (diff)
New upstream version 1.2.1upstream/1.2.1
Diffstat (limited to 'backend/kvs40xx.c')
-rw-r--r--backend/kvs40xx.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/backend/kvs40xx.c b/backend/kvs40xx.c
index 230bdc2..fd3cfe0 100644
--- a/backend/kvs40xx.c
+++ b/backend/kvs40xx.c
@@ -118,11 +118,6 @@ static inline void buf_set_st(struct buf *b, SANE_Status st)
pthread_mutex_unlock(&b->mu);
}
-static inline void buf_cancel(struct buf *b)
-{
- buf_set_st(b, SANE_STATUS_CANCELLED);
-}
-
static inline void push_buf(struct buf *b, SANE_Int sz)
{
pthread_mutex_lock(&b->mu);
@@ -547,10 +542,10 @@ static void * read_data (void *arg)
sane_get_parameters(s, NULL);
s->page++;
- return SANE_STATUS_GOOD;
+ return NULL;
err:
s->scanning = 0;
- return (void *) st;
+ return NULL;
}
/* Start scanning */