summaryrefslogtreecommitdiff
path: root/backend/tamarack.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-10-08 12:33:06 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-10-08 12:33:06 +0200
commit24feb9f37f302c006ba51502da817325200e74d0 (patch)
treed4451782449e5fcbae9cbe3778c51a8c6cb3c36d /backend/tamarack.c
parent76b69ebb381d40458339c9940135740797cbd2d4 (diff)
parentcfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (diff)
Merge tag 'upstream/1.0.25'
Upstream version 1.0.25
Diffstat (limited to 'backend/tamarack.c')
-rw-r--r--backend/tamarack.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/backend/tamarack.c b/backend/tamarack.c
index 9baec51..e7073af 100644
--- a/backend/tamarack.c
+++ b/backend/tamarack.c
@@ -77,6 +77,7 @@
#define TAMARACK_CONFIG_FILE "tamarack.conf"
+static const SANE_Device **devlist = NULL;
static int num_devices;
static Tamarack_Device *first_dev;
static Tamarack_Scanner *first_handle;
@@ -950,12 +951,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;
Tamarack_Device *dev;
int i;