summaryrefslogtreecommitdiff
path: root/backend/tamarack.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-09-27 08:20:20 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-09-27 08:20:20 +0200
commite94622c319e4307617b202f19d3ec05b21a9bb49 (patch)
treec5ddf44352b9bd47aeb3eb432ba79638079efe25 /backend/tamarack.c
parent6f2255c9648b175d51e2c8e5e9670557f9dc4ee1 (diff)
merge to 1.0.25+git20150927
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;