From 40f4885ab8570cfe7dee965fb0e6d32e3933733d Mon Sep 17 00:00:00 2001 From: Andrew Sayers Date: Tue, 30 Mar 2021 12:16:08 +0100 Subject: [PATCH] xerox_mfp: return correct value in dev_acquire() dev_acquire() is expected to return 1 on success and 0 on failure. Fix the cases where it returned non-zero on error. --- backend/xerox_mfp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c index 310dc535c..729ecb7d8 100644 --- a/backend/xerox_mfp.c +++ b/backend/xerox_mfp.c @@ -1161,7 +1161,7 @@ sane_get_parameters(SANE_Handle h, SANE_Parameters *para) static int dev_acquire(struct device *dev) { if (!dev_cmd_wait(dev, CMD_READ)) - return dev->state; + return 0; dev->state = SANE_STATUS_GOOD; dev->vertical = dev->res[0x08] << 8 | dev->res[0x09]; @@ -1188,7 +1188,8 @@ static int dev_acquire(struct device *dev) if (dev->bytes_per_line > DATASIZE) { DBG(1, "%s: unsupported line size: %d bytes > %d\n", __func__, dev->bytes_per_line, DATASIZE); - return ret_cancel(dev, SANE_STATUS_NO_MEM); + ret_cancel(dev, SANE_STATUS_NO_MEM); + return 0; } dev->reading = 0; /* need to issue READ_IMAGE */