diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:29:05 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:29:05 +0200 |
| commit | 324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch) | |
| tree | bd2d48a139bfbe869f4f49359b63097931a45e7b /backend/rts8891.c | |
| parent | 2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff) | |
| parent | 1edb02101a9306fc711cd422ed507d18165b1691 (diff) | |
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/rts8891.c')
| -rw-r--r-- | backend/rts8891.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/backend/rts8891.c b/backend/rts8891.c index bdb4011..0eaff7b 100644 --- a/backend/rts8891.c +++ b/backend/rts8891.c @@ -617,7 +617,7 @@ set_automatic_value (Rts8891_Session * s, int option, SANE_Int * myinfo) { SANE_Status status = SANE_STATUS_GOOD; SANE_Int i, min; - SANE_Word *dpi_list; + const SANE_Word *dpi_list; switch (option) { @@ -639,7 +639,7 @@ set_automatic_value (Rts8891_Session * s, int option, SANE_Int * myinfo) break; case OPT_RESOLUTION: /* we set up to the lowest available dpi value */ - dpi_list = (SANE_Word *) s->opt[OPT_RESOLUTION].constraint.word_list; + dpi_list = s->opt[OPT_RESOLUTION].constraint.word_list; min = 65536; for (i = 1; i < dpi_list[0]; i++) { @@ -2233,11 +2233,11 @@ sane_close (SANE_Handle handle) if (session->dev->model->gamma != session->val[OPT_GAMMA_VECTOR_B].wa) free (session->val[OPT_GAMMA_VECTOR_B].wa); free (session->val[OPT_MODE].s); - free (session->opt[OPT_RESOLUTION].constraint.word_list); + free ((void *) session->opt[OPT_RESOLUTION].constraint.word_list); for (i = OPT_BUTTON_1; i <= OPT_BUTTON_11; i++) { - free (session->opt[i].name); - free (session->opt[i].title); + free ((void *) session->opt[i].name); + free ((void *) session->opt[i].title); } free (session); @@ -7702,7 +7702,7 @@ park_head (struct Rts8891_Device *dev, SANE_Bool wait) sanei_rts88xx_read_reg (dev->devnum, CONTROLER_REG, ®); if (reg != 0x20) { - DBG (DBG_warn, "park_head: unexpected controler value 0x%02x\n", reg); + DBG (DBG_warn, "park_head: unexpected controller value 0x%02x\n", reg); } /* head parking */ |