From 5dd9eeb0837b8fdef3c3f75a5d518616680fdcc4 Mon Sep 17 00:00:00 2001
From: Ralph Little <skelband@gmail.com>
Date: Sun, 26 Jul 2020 11:19:31 -0700
Subject: [PATCH] gt68xx: Restore cancel "stop_scan" call and fix whitespace
 issue

The original issue that I had with this patch was in the cancel function
where the patch author had commented out the "stop scan" call for cancel.
This made no sense to me. I have put it back in for testing.
It might have been accidentally left out.
---
 backend/gt68xx.c     | 8 +++++---
 backend/gt68xx_mid.c | 1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/gt68xx.c b/backend/gt68xx.c
index 568bbc749..f657d42a2 100644
--- a/backend/gt68xx.c
+++ b/backend/gt68xx.c
@@ -2329,7 +2329,7 @@ sane_cancel (SANE_Handle handle)
       /* some scanners don't like this command when cancelling a scan */
       sanei_usb_set_timeout (SHORT_TIMEOUT);
       gt68xx_device_fix_descriptor (s->dev);
-      //gt68xx_scanner_stop_scan (s);
+      gt68xx_scanner_stop_scan (s);
       sanei_usb_set_timeout (LONG_TIMEOUT);
 
       if (s->dev->model->flags & GT68XX_FLAG_SHEET_FED)
@@ -2344,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
     {
diff --git a/backend/gt68xx_mid.c b/backend/gt68xx_mid.c
index 2d4c74504..1d6a5c68f 100644
--- a/backend/gt68xx_mid.c
+++ b/backend/gt68xx_mid.c
@@ -1161,7 +1161,6 @@ gt68xx_line_reader_free (GT68xx_Line_Reader * reader)
       return SANE_STATUS_INVAL;
     }
 
- 
   gt68xx_line_reader_free_delays (reader);
 
   if (reader->pixel_buffer)