From 7ef811957979776c16fbdc2c742c2ec26fe96223 Mon Sep 17 00:00:00 2001
From: Nicolas Martin <nicols-guest@users.alioth.debian.org>
Date: Wed, 25 Jun 2008 20:54:16 +0000
Subject: [PATCH] Patch from Sam Varshavchik to deal with libusb 64 read issue,
 for ImageClass MFPs.

---
 ChangeLog                  | 5 +++++
 backend/pixma_imageclass.c | 2 +-
 backend/pixma_io_sanei.c   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 67b19c28b..9214250ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-25  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma_imageclass.c:
+	Patch from Sam Varshavchik to deal with libusb 64 read issue, 
+	for ImageClass MFPs.
+
 2008-06-24  m. allan noah <kitno455 a t gmail d o t com>
 	* backend/fujitsu.[ch], backend/fujitsu-scsi.h,
 	  doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man:
diff --git a/backend/pixma_imageclass.c b/backend/pixma_imageclass.c
index 5d16e169d..1c4e5bd75 100644
--- a/backend/pixma_imageclass.c
+++ b/backend/pixma_imageclass.c
@@ -255,7 +255,7 @@ read_image_block (pixma_t * s, uint8_t * data, unsigned size)
       if (size >= MAX_CHUNK_SIZE)
 	chunksize = MAX_CHUNK_SIZE;
       else if (size < MIN_CHUNK_SIZE)
-	chunksize = MIN_CHUNK_SIZE;
+	chunksize = size;
       else
 	chunksize = size - (size % MIN_CHUNK_SIZE);
       error = pixma_read (s->io, data, chunksize);
diff --git a/backend/pixma_io_sanei.c b/backend/pixma_io_sanei.c
index 5b6f4e09c..531f1287a 100644
--- a/backend/pixma_io_sanei.c
+++ b/backend/pixma_io_sanei.c
@@ -235,7 +235,7 @@ map_error (SANE_Status ss)
     case SANE_STATUS_NO_DOCS:
        return PIXMA_ENO_PAPER;
     case SANE_STATUS_EOF:
-    case SANE_STATUS_HW_LOCKED:         /* unused by pixma */
+    case SANE_STATUS_HW_LOCKED:       /* unused by pixma */
     case SANE_STATUS_WARMING_UP:      /* unused by pixma */
       break;
     }