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/dmc.c | |
| parent | 76b69ebb381d40458339c9940135740797cbd2d4 (diff) | |
| parent | cfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (diff) | |
Merge tag 'upstream/1.0.25'
Upstream version 1.0.25
Diffstat (limited to 'backend/dmc.c')
| -rw-r--r-- | backend/dmc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/backend/dmc.c b/backend/dmc.c index 96f9186..7fc2ae9 100644 --- a/backend/dmc.c +++ b/backend/dmc.c @@ -75,6 +75,7 @@ static DMC_Device *FirstDevice = NULL; static DMC_Camera *FirstHandle = NULL; static int NumDevices = 0; +static SANE_Device const **devlist = NULL; static SANE_String_Const ValidModes[] = { "Full frame", "Viewfinder", "Raw", "Thumbnail", @@ -867,6 +868,9 @@ sane_exit(void) free(dev); dev = next; } + + if (devlist) + free (devlist); } /********************************************************************** @@ -882,7 +886,6 @@ sane_exit(void) SANE_Status sane_get_devices(SANE_Device const ***device_list, SANE_Bool local_only) { - static SANE_Device const **devlist = 0; DMC_Device *dev; int i = 0; |