Fixes Busy mode exit processing.

enthdegree · Jan 17, 2009 · 7cb2fed · 7cb2fed
1 parent a42b571
commit 7cb2fed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-17  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* pixma_mp150.c:
+	Fixed "Busy mode" exit processing. 
+
 2009-01-17 Julien Blache <[email protected]>
 	* doc/descriptions/hp.desc: add SCSI identifiers for the ScanJet
 	IIc, from Daniel Golle (sane-devel, 20061105).

diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
@@ -1233,7 +1233,7 @@ mp150_scan (pixma_t * s)
       if ((error >= 0) && !is_scanning_from_tpu (s))
         for (i = (mp->generation == 3) ? 3 : 1 ; i > 0 && error >= 0; i--)
           error = send_gamma_table (s);
-      else /* if (mp->generation == 3)   FIXME: Does this apply also to gen1/2 ? YES */
+      else if (error >= 0)  /* in TPU mode, for gen 1, 2, and 3 */
         error = send_set_tpu_info (s);
     }
   else   /* ADF pageid != 0 and gen3 */