Merge branch 'next' into for-linus-3.0

[pandora-kernel.git] / arch / sparc / kernel / viohs.c

diff --git a/arch/sparc/kernel/viohs.c b/arch/sparc/kernel/viohs.c
index 708fa17..29348ea 100644 (file)
--- a/arch/sparc/kernel/viohs.c
+++ b/arch/sparc/kernel/viohs.c
@@ -337,8 +337,10 @@ static int process_ver_nack(struct vio_driver_state *vio,
        viodbg(HS, "GOT VERSION NACK maj[%u] min[%u] devclass[%u]\n",
               pkt->major, pkt->minor, pkt->dev_class);
 
-       if ((pkt->major == 0 && pkt->minor == 0) ||
-           !(nver = find_by_major(vio, pkt->major)))
+       if (pkt->major == 0 && pkt->minor == 0)
+               return handshake_failure(vio);
+       nver = find_by_major(vio, pkt->major);
+       if (!nver)
                return handshake_failure(vio);
 
        if (send_version(vio, nver->major, nver->minor) < 0)
@@ -361,7 +363,7 @@ static int process_ver(struct vio_driver_state *vio, struct vio_ver_info *pkt)
 
        default:
                return handshake_failure(vio);
-       };
+       }
 }
 
 static int process_attr(struct vio_driver_state *vio, void *pkt)