diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-08 12:32:49 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-08 12:32:49 +0200 |
| commit | cfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (patch) | |
| tree | 56cb8849a5df91b19b72fd4f48c79c343cd9bc5e /backend/coolscan.c | |
| parent | ba8d09abe681600aad991f4a75e904615b7ed29f (diff) | |
Imported Upstream version 1.0.25upstream/1.0.25
Diffstat (limited to 'backend/coolscan.c')
| -rw-r--r-- | backend/coolscan.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/backend/coolscan.c b/backend/coolscan.c index 00a12e4..6828a16 100644 --- a/backend/coolscan.c +++ b/backend/coolscan.c @@ -179,7 +179,7 @@ request_sense_parse (unsigned char *sensed_data) case 0x2: if ((0x4 == asc) && (0x1 == ascq)) { - DBG (10, "\t%d/%d/%d: Logical unit is in process of becomming ready\n", + DBG (10, "\t%d/%d/%d: Logical unit is in process of becoming ready\n", sense, asc, ascq); ret = SANE_STATUS_DEVICE_BUSY; } @@ -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; |