Memtest86+: Apply crash fix patch

Patch taken from fedora updates:
    http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/log/

This is credited to David McInnis, but I couldn't find the
origin of the patch.

Change-Id: I720bd0dda76bc79b43474caa3905c8901c59f828
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/13825
Reviewed-by: Ben Gardner <gardner.ben@gmail.com>
diff --git a/controller.c b/controller.c
index 09b40a4..183e9c3 100644
--- a/controller.c
+++ b/controller.c
@@ -2,6 +2,8 @@
  * MemTest86+ V5 Specific code (GPL V2.0)
  * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
  * http://www.canardpc.com - http://www.memtest.org
+ *
+ * Edited by David McInnis Oct 4, 2014
  */
 
 //#include "defs.h"
@@ -1424,7 +1426,7 @@
 	unsigned long dramchr;
 	float clockratio;
 	double dramclock;
-	unsigned int dummy[3];
+	unsigned int dummy[4];
 	int ram_type;
 
 	float coef = 10;
@@ -2851,13 +2853,13 @@
 
 static void poll_timings_i875(void) {
 
-	ulong dev6, dev62;
+	ulong dev6;
 	ulong temp;
 	float cas;
 	int rcd, rp, ras, chan;
 	long *ptr, *ptr2;
 
-	pci_conf_read( 0, 6, 0, 0x40, 4, &dev62);
+	pci_conf_read( 0, 6, 0, 0x40, 4, &dev6);
 	ptr2=(long*)(dev6+0x68);
 
 	/* Read the MMR Base Address & Define the pointer */
diff --git a/init.c b/init.c
index 53f3de8..900ac9f 100644
--- a/init.c
+++ b/init.c
@@ -7,6 +7,8 @@
  *
  * Released under version 2 of the Gnu Public License.
  * By Chris Brady
+ *
+ * Edited by David McInnis October 4, 2014
  */
  
 
@@ -913,7 +915,6 @@
 			default:
 				cprint(0, COL_MID, "Unknown Intel");
  				break;
-			break;
 		    }
 
 		}
diff --git a/main.c b/main.c
index 4aa119d..da09dc9 100644
--- a/main.c
+++ b/main.c
@@ -432,7 +432,7 @@
 		//initialise_cpus();
 		btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0);
 		/* Draw the screen and get system information */
-	  init();
+		init();
 
 		/* Set defaults and initialize variables */
 		set_defaults();
@@ -747,7 +747,7 @@
 			    /* Do the same test for each CPU */
 			    if (++cpu_sel >= act_cpus) 
 			    	{
-	            cpu_sel = 0;
+				cpu_sel = 0;
 			        next_test();
 			    	} else {
 			        continue;