diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 | 
| commit | 64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch) | |
| tree | 4303648095deff998ae20c2393b56db527742ac9 /backend/rts8891_low.c | |
| parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
| parent | ecaaf250cb33ff61f37a7b441f2337584a655350 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/rts8891_low.c')
| -rw-r--r-- | backend/rts8891_low.c | 12 | 
1 files changed, 5 insertions, 7 deletions
| diff --git a/backend/rts8891_low.c b/backend/rts8891_low.c index 4fc5666..535f6d5 100644 --- a/backend/rts8891_low.c +++ b/backend/rts8891_low.c @@ -15,9 +15,7 @@     General Public License for more details.     You should have received a copy of the GNU General Public License -   along with this program; if not, write to the Free Software -   Foundation, Inc., 59 Temple Place - Suite 330, Boston, -   MA 02111-1307, USA. +   along with this program.  If not, see <https://www.gnu.org/licenses/>.     As a special exception, the authors of SANE give permission for     additional uses of the libraries contained in this release of SANE. @@ -129,7 +127,7 @@ rts8891_write_all (SANE_Int devnum, SANE_Byte * regs, SANE_Int count)        return SANE_STATUS_IO_ERROR;      } -  size = count - 0xb4;		/*  we need to substract one reg since b3 won't be written */ +  size = count - 0xb4;		/*  we need to subtract one reg since b3 won't be written */    buffer[0] = 0x88;    buffer[1] = 0xb4;    buffer[2] = 0x00; @@ -531,7 +529,7 @@ rts8891_move (struct Rts8891_Device *device, SANE_Byte * regs,        regs[0x36] = regs[0x36] & 0xf7;      } -  /* write regiters values */ +  /* write registers values */    status = rts8891_write_all (device->devnum, regs, RTS8891_MAX_REGISTERS);    /* commit it */ @@ -616,7 +614,7 @@ rts8891_park (struct Rts8891_Device *device, SANE_Byte *regs, SANE_Bool wait)  /* reads data from scanner.   * First we wait for some data to be available and then loop reading   * from scanner until the required amount is reached. - * We handle non blocking I/O by returning immediatly (with SANE_STATUS_BUSY) + * We handle non blocking I/O by returning immediately (with SANE_STATUS_BUSY)   * if there is no data available from scanner. But once read is started,   * all the required amount is read. Once wait for data succeeded, we still poll   * for data in order no to read it too fast, but we don' take care of non blocking @@ -667,7 +665,7 @@ read_data (struct Rts8891_Session *session, SANE_Byte * dest, SANE_Int length)  	      dev->regs[LAMP_REG] = 0x8d;  	      sanei_rts88xx_write_reg (dev->devnum, LAMP_REG,  				       &(dev->regs[LAMP_REG])); -	      DBG (DBG_io, "read_data: no data vailable\n"); +	      DBG (DBG_io, "read_data: no data available\n");  	      DBG (DBG_proc, "read_data: end\n");  	      return SANE_STATUS_DEVICE_BUSY;  	    } | 
