diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-08 12:33:06 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-08 12:33:06 +0200 |
| commit | 24feb9f37f302c006ba51502da817325200e74d0 (patch) | |
| tree | d4451782449e5fcbae9cbe3778c51a8c6cb3c36d /backend/abaton.c | |
| parent | 76b69ebb381d40458339c9940135740797cbd2d4 (diff) | |
| parent | cfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (diff) | |
Merge tag 'upstream/1.0.25'
Upstream version 1.0.25
Diffstat (limited to 'backend/abaton.c')
| -rw-r--r-- | backend/abaton.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/backend/abaton.c b/backend/abaton.c index 10f5c21..4008c62 100644 --- a/backend/abaton.c +++ b/backend/abaton.c @@ -82,6 +82,7 @@ +static const SANE_Device **devlist = 0; static int num_devices; static Abaton_Device *first_dev; static Abaton_Scanner *first_handle; @@ -905,12 +906,14 @@ sane_exit (void) free ((void *) dev->sane.model); free (dev); } + + if (devlist) + free (devlist); } SANE_Status sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) { - static const SANE_Device **devlist = 0; Abaton_Device *dev; int i; @@ -1455,7 +1458,7 @@ sane_cancel (SANE_Handle handle) if (s->AbortedByUser) { DBG (FLOW_CONTROL, "sane_cancel: Scan has not been initiated yet." - "we probably recieved a signal while writing data.\n"); + "we probably received a signal while writing data.\n"); s->AbortedByUser = SANE_FALSE; } else |