diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
commit | d087d778ffb62e2713cb848540bcc819470365bd (patch) | |
tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/snapscan-scsi.c | |
parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/snapscan-scsi.c')
-rw-r--r-- | backend/snapscan-scsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/snapscan-scsi.c b/backend/snapscan-scsi.c index 861ff32..b6e43a1 100644 --- a/backend/snapscan-scsi.c +++ b/backend/snapscan-scsi.c @@ -80,9 +80,9 @@ static SnapScan_Model snapscani_get_model_id(char* model_str, int fd, SnapScan_B if ((bus_type == USB) && (sanei_usb_get_vendor_product(fd, &vendor_id, &product_id) == SANE_STATUS_GOOD)) { - DBG(DL_MINOR_INFO, + DBG(DL_MINOR_INFO, "%s: looking up scanner for ID 0x%04x,0x%04x.\n", - me, vendor_id, product_id); + me, vendor_id, product_id); for (i = 0; i < known_usb_scanners; i++) { if ((usb_scanners[i].vendor_id == vendor_id) && @@ -1320,7 +1320,7 @@ static SANE_Status wait_scanner_ready (SnapScan_Scanner *pss) else { /* This seems to happen for Epson scanners. Return - SANE_STATUS_GOOD and hope the scanner accepts the + SANE_STATUS_GOOD and hope the scanner accepts the next command... */ DBG (DL_CALL_TRACE, "%s: No timeout specified, returning immediately\n", me); return SANE_STATUS_GOOD; |