summaryrefslogtreecommitdiff
path: root/backend/coolscan.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/coolscan.c
parent6f2255c9648b175d51e2c8e5e9670557f9dc4ee1 (diff)
merge to 1.0.25+git20150927
Diffstat (limited to 'backend/coolscan.c')
-rw-r--r--backend/coolscan.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/backend/coolscan.c b/backend/coolscan.c
index d3c7749..6828a16 100644
--- a/backend/coolscan.c
+++ b/backend/coolscan.c
@@ -1987,6 +1987,7 @@ static const SANE_Range shift_range =
0
};
+static const SANE_Device **devlist = 0;
static int num_devices;
static Coolscan_t *first_dev;
@@ -3287,6 +3288,9 @@ sane_exit (void)
free (dev->obuffer);
free (dev);
}
+
+ if (devlist)
+ free (devlist);
}
/* ----------------------------- SANE GET DEVICES -------------------------- */
@@ -3294,8 +3298,6 @@ SANE_Status
sane_get_devices (const SANE_Device *** device_list,
SANE_Bool local_only)
{
-
- static const SANE_Device **devlist = 0;
Coolscan_t *dev;
int i;