From 53450b681051b5c71746af5d4bfeb53f7c25d5df Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Sat, 20 Jul 2019 11:02:40 +0300 Subject: [PATCH] genesys: Return errors as exceptions from genesys_start_scan() --- backend/genesys.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/backend/genesys.cc b/backend/genesys.cc index 629ccfe77..73a4607f3 100644 --- a/backend/genesys.cc +++ b/backend/genesys.cc @@ -3373,9 +3373,8 @@ static void genesys_warmup_lamp(Genesys_Device* dev) } -/* High-level start of scanning */ -static SANE_Status -genesys_start_scan (Genesys_Device * dev, SANE_Bool lamp_off) +// High-level start of scanning +static void genesys_start_scan(Genesys_Device* dev, SANE_Bool lamp_off) { DBG_HELPER(dbg); unsigned int steps, expected; @@ -3546,8 +3545,6 @@ genesys_start_scan (Genesys_Device * dev, SANE_Bool lamp_off) } while (steps < 1); } - - return SANE_STATUS_GOOD; } /* this is _not_ a ringbuffer. @@ -6733,7 +6730,7 @@ SANE_Status sane_start_impl(SANE_Handle handle) parameters will be overwritten below, but that's OK. */ RIE (calc_parameters (s)); - RIE(genesys_start_scan(s->dev, s->lamp_off)); + genesys_start_scan(s->dev, s->lamp_off); s->scanning = SANE_TRUE;