Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Work around branch tracer warning.
  sparc64: Fix unsigned long long warnings in drivers.
  sparc64: Use unsigned long long for u64.
  sparc: refactor code in fault_32.c
  sparc64: refactor code in init_64.c
  sparc64: refactor code in viohs.c
  sparc: make proces_ver_nack a bit more readable

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/sparc/kernel/viohs.c b/arch/sparc/kernel/viohs.c
index 708fa1705fbe..aa6ac70d4fd5 100644
--- 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)