[PATCH] parport: phase fixes

Did not move the parport interface properly into IEEE1284_PH_REV_IDLE phase at
end of data due to comparing bytes with nibbles.  Internal phase
IEEE1284_PH_HBUSY_DNA became unused, so remove it.

Signed-off-by: Marko Kohtala <marko.kohtala@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 42 insertions, 50 deletions

diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c
index ddf184f95d80..6861d408f1b3 100644
--- a/drivers/media/video/cpia_pp.c
+++ b/drivers/media/video/cpia_pp.c
@@ -170,16 +170,9 @@ static size_t cpia_read_nibble (struct parport *port,
                 /* Does the error line indicate end of data? */
                 if (((i /*& 1*/) == 0) &&
                     (parport_read_status(port) & PARPORT_STATUS_ERROR)) {
-                        port->physport->ieee1284.phase = IEEE1284_PH_HBUSY_DNA;
-                                DBG("%s: No more nibble data (%d bytes)\n",
-                                port->name, i/2);
-
-                        /* Go to reverse idle phase. */
-                        parport_frob_control (port,
-                                              PARPORT_CONTROL_AUTOFD,
-                                              PARPORT_CONTROL_AUTOFD);
-                        port->physport->ieee1284.phase = IEEE1284_PH_REV_IDLE;
-                        break;
+                        DBG("%s: No more nibble data (%d bytes)\n",
+                            port->name, i/2);
+                        goto end_of_data;
                 }
 
                 /* Event 7: Set nAutoFd low. */
@@ -227,18 +220,21 @@ static size_t cpia_read_nibble (struct parport *port,
                         byte = nibble;
         }
 
-        i /= 2; /* i is now in bytes */
-
         if (i == len) {
                 /* Read the last nibble without checking data avail. */
-                port = port->physport;
-                if (parport_read_status (port) & PARPORT_STATUS_ERROR)
-                        port->ieee1284.phase = IEEE1284_PH_HBUSY_DNA;
+                if (parport_read_status (port) & PARPORT_STATUS_ERROR) {
+                end_of_data:
+                        /* Go to reverse idle phase. */
+                        parport_frob_control (port,
+                                              PARPORT_CONTROL_AUTOFD,
+                                              PARPORT_CONTROL_AUTOFD);
+                        port->physport->ieee1284.phase = IEEE1284_PH_REV_IDLE;
+                }
                 else
-                        port->ieee1284.phase = IEEE1284_PH_HBUSY_DAVAIL;
+                        port->physport->ieee1284.phase = IEEE1284_PH_HBUSY_DAVAIL;
         }
 
-        return i;
+        return i/2;
 }
 
 /* CPiA nonstandard "Nibble Stream" mode (2 nibbles per cycle, instead of 1)
diff --git a/drivers/parport/ieee1284_ops.c b/drivers/parport/ieee1284_ops.c
index ce1e2aad8b10..d6c77658231e 100644
--- a/drivers/parport/ieee1284_ops.c
+++ b/drivers/parport/ieee1284_ops.c
@@ -165,17 +165,7 @@ size_t parport_ieee1284_read_nibble (struct parport *port,
                 /* Does the error line indicate end of data? */
                 if (((i & 1) == 0) &&
                     (parport_read_status(port) & PARPORT_STATUS_ERROR)) {
-                        port->physport->ieee1284.phase = IEEE1284_PH_HBUSY_DNA;
-                        DPRINTK (KERN_DEBUG
-                                "%s: No more nibble data (%d bytes)\n",
-                                port->name, i/2);
-
-                        /* Go to reverse idle phase. */
-                        parport_frob_control (port,
-                                              PARPORT_CONTROL_AUTOFD,
-                                              PARPORT_CONTROL_AUTOFD);
-                        port->physport->ieee1284.phase = IEEE1284_PH_REV_IDLE;
-                        break;
+                        goto end_of_data;
                 }
 
                 /* Event 7: Set nAutoFd low. */
@@ -225,18 +215,25 @@ size_t parport_ieee1284_read_nibble (struct parport *port,
                         byte = nibble;
         }
 
-        i /= 2; /* i is now in bytes */
-
         if (i == len) {
                 /* Read the last nibble without checking data avail. */
-                port = port->physport;
-                if (parport_read_status (port) & PARPORT_STATUS_ERROR)
-                        port->ieee1284.phase = IEEE1284_PH_HBUSY_DNA;
+                if (parport_read_status (port) & PARPORT_STATUS_ERROR) {
+                end_of_data:
+                        DPRINTK (KERN_DEBUG
+                                "%s: No more nibble data (%d bytes)\n",
+                                port->name, i/2);
+
+                        /* Go to reverse idle phase. */
+                        parport_frob_control (port,
+                                              PARPORT_CONTROL_AUTOFD,
+                                              PARPORT_CONTROL_AUTOFD);
+                        port->physport->ieee1284.phase = IEEE1284_PH_REV_IDLE;
+                }
                 else
-                        port->ieee1284.phase = IEEE1284_PH_HBUSY_DAVAIL;
+                        port->physport->ieee1284.phase = IEEE1284_PH_HBUSY_DAVAIL;
         }
 
-        return i;
+        return i/2;
 #endif /* IEEE1284 support */
 }
 
@@ -256,17 +253,7 @@ size_t parport_ieee1284_read_byte (struct parport *port,
 
                 /* Data available? */
                 if (parport_read_status (port) & PARPORT_STATUS_ERROR) {
-                        port->physport->ieee1284.phase = IEEE1284_PH_HBUSY_DNA;
-                        DPRINTK (KERN_DEBUG
-                                 "%s: No more byte data (%Zd bytes)\n",
-                                 port->name, count);
-
-                        /* Go to reverse idle phase. */
-                        parport_frob_control (port,
-                                              PARPORT_CONTROL_AUTOFD,
-                                              PARPORT_CONTROL_AUTOFD);
-                        port->physport->ieee1284.phase = IEEE1284_PH_REV_IDLE;
-                        break;
+                        goto end_of_data;
                 }
 
                 /* Event 14: Place data bus in high impedance state. */
@@ -318,11 +305,20 @@ size_t parport_ieee1284_read_byte (struct parport *port,
 
         if (count == len) {
                 /* Read the last byte without checking data avail. */
-                port = port->physport;
-                if (parport_read_status (port) & PARPORT_STATUS_ERROR)
-                        port->ieee1284.phase = IEEE1284_PH_HBUSY_DNA;
+                if (parport_read_status (port) & PARPORT_STATUS_ERROR) {
+                end_of_data:
+                        DPRINTK (KERN_DEBUG
+                                 "%s: No more byte data (%Zd bytes)\n",
+                                 port->name, count);
+
+                        /* Go to reverse idle phase. */
+                        parport_frob_control (port,
+                                              PARPORT_CONTROL_AUTOFD,
+                                              PARPORT_CONTROL_AUTOFD);
+                        port->physport->ieee1284.phase = IEEE1284_PH_REV_IDLE;
+                }
                 else
-                        port->ieee1284.phase = IEEE1284_PH_HBUSY_DAVAIL;
+                        port->physport->ieee1284.phase = IEEE1284_PH_HBUSY_DAVAIL;
         }
 
         return count;