diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-10 19:11:27 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-10 19:11:27 +0200 |
| commit | 7e9455b3b15671ff99ed168638c405e2acedb6df (patch) | |
| tree | 444e59ece236e09dc153f665e42160aeb0208c24 /backend/gt68xx.c | |
| parent | bc8a517abd2e11e1435f4ef042cfcc8648b62ef7 (diff) | |
| parent | bce41b3c37c2a68e7dab234ce0247755a61ceb40 (diff) | |
Merge branch 'release/debian/1.0.31-1_experimental1' into masterdebian/1.0.31-1_experimental1
Diffstat (limited to 'backend/gt68xx.c')
| -rw-r--r-- | backend/gt68xx.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/backend/gt68xx.c b/backend/gt68xx.c index 00190fe..f657d42 100644 --- a/backend/gt68xx.c +++ b/backend/gt68xx.c @@ -2130,6 +2130,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len, && s->byte_count >= s->reader->params.pixel_xs) { DBG (4, "sane_read: nothing more to scan: EOF\n"); + gt68xx_scanner_stop_scan(s); return SANE_STATUS_EOF; } @@ -2343,8 +2344,10 @@ sane_cancel (SANE_Handle handle) gt68xx_device_carriage_home (s->dev); } if (s->gamma_table) - free (s->gamma_table); - s->gamma_table = 0; + { + free (s->gamma_table); + s->gamma_table = 0; + } } else { |