diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-03-30 21:30:45 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-03-30 21:30:45 +0200 |
| commit | ee770c2346eb37e0dcb8b6cf3eaacf3d8efd6bbc (patch) | |
| tree | 58f05092be1a17a939e861f8cadcda1b6ca2ecef /backend/ricoh-scsi.c | |
| parent | 0da9e21872802cfc6e975b1ebaf9efb9e5934d84 (diff) | |
| parent | fef76e17ed4c607ea73b81279f9ef1d7121be900 (diff) | |
Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1
Diffstat (limited to 'backend/ricoh-scsi.c')
| -rw-r--r-- | backend/ricoh-scsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backend/ricoh-scsi.c b/backend/ricoh-scsi.c index 72fd70b..73bd4fa 100644 --- a/backend/ricoh-scsi.c +++ b/backend/ricoh-scsi.c @@ -39,9 +39,9 @@ whether to permit this exception to apply to your modifications. If you do not wish that, delete this exception notice. */ -/* +/* $Id$ - This file implements the low-level scsi-commands. + This file implements the low-level scsi-commands. */ @@ -251,7 +251,7 @@ set_window (int fd, struct ricoh_window_data *rwd) static SANE_Status get_window (int fd, struct ricoh_window_data *rwd) { - + static struct scsi_window_cmd cmd; static size_t rwd_size; SANE_Status status; @@ -317,7 +317,7 @@ get_data_status (int fd, struct scsi_status_desc *dbs) status = sanei_scsi_cmd (fd, &cmd, sizeof (cmd), &ssd, &ssd_size); memcpy (dbs, &ssd.desc, sizeof(*dbs)); - if (status == SANE_STATUS_GOOD && + if (status == SANE_STATUS_GOOD && (((unsigned int) _3btol(ssd.len)) <= sizeof(*dbs) || _3btol(ssd.desc.filled) == 0)) { DBG (11, "get_data_status: busy\n"); status = SANE_STATUS_DEVICE_BUSY; |