summaryrefslogtreecommitdiff
path: root/backend/kvs40xx.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:29 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:29 +0100
commit882fd010527b8d8823f09e19edbed3746265fa08 (patch)
treebe5c7cace6697afc753c152d13ad5145d0884a42 /backend/kvs40xx.c
parent527bedac30eb120915718eb7997e6dacd583512e (diff)
parente0d94cf4d39395df1e2c6bb4d967200298c13881 (diff)
Merge branch 'feature/upstream' into develop
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 */