From e1b835bf4823cd0469fb28d1278d0ab88e62ac46 Mon Sep 17 00:00:00 2001
From: Alessandro Zummo <a.zummo@towertech.it>
Date: Tue, 2 Jun 2009 19:19:29 +0200
Subject: [PATCH] epson2: check for warming up condition after a start failure

Sometimes a "fatal error" is given back when the scanner is warming up.
The previousversion of the code checked for that issue only when
the ADF was in use.
---
 backend/epson2.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/epson2.c b/backend/epson2.c
index e00b00671..6cd6e4f9e 100644
--- a/backend/epson2.c
+++ b/backend/epson2.c
@@ -2438,8 +2438,10 @@ sane_start(SANE_Handle handle)
 	if (dev->extended_commands) {
 		status = e2_start_ext_scan(s);
 
-		/* check if the scanner signaled a warming up */
-		if (status == SANE_STATUS_IO_ERROR && s->hw->use_extension) {
+		/* sometimes the scanner gives an io error when
+		 * it's warming up.
+		 */
+		if (status == SANE_STATUS_IO_ERROR) {
 		        status = e2_wait_warm_up(s);
         		if (status == SANE_STATUS_GOOD)
 	        		status = e2_start_ext_scan(s);