summaryrefslogtreecommitdiff
path: root/backend/s9036.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/s9036.c
parent76b69ebb381d40458339c9940135740797cbd2d4 (diff)
parentcfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (diff)
Merge tag 'upstream/1.0.25'
Upstream version 1.0.25
Diffstat (limited to 'backend/s9036.c')
-rw-r--r--backend/s9036.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/backend/s9036.c b/backend/s9036.c
index 9313622..1b97f80 100644
--- a/backend/s9036.c
+++ b/backend/s9036.c
@@ -45,6 +45,7 @@
#undef Byte
#define Byte SANE_Byte
+static const SANE_Device **devlist = NULL;
static int num_devices;
static S9036_Device *s9036_devices;
@@ -870,12 +871,14 @@ sane_exit (void)
sane_close (dev->handle);
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;
S9036_Device *dev;
int i;