diff --git a/chipset_enable.c b/chipset_enable.c
index d1ab9643096f3f93ec26bb4b9c3e1e0d2568d1e4..dc6d8bc180d93926f552b1c0a44672d3b4485031 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -212,6 +212,8 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name, unsign
 	bbs = (gcs >> 10) & 0x3;
 	printf_debug("BOOT BIOS Straps: 0x%x (%s)\n",	bbs,
 		     (bbs == 0x3) ? "LPC" : ((bbs == 0x2) ? "PCI" : "SPI"));
+	if (bbs >= 2)
+		ich7_detected = 0;
 
 	buc = *(volatile uint8_t *)(rcrb + 0x3414);
 	printf_debug("Top Swap : %s\n", (buc & 1)?"enabled (A16 inverted)":"not enabled");
diff --git a/ichspi.c b/ichspi.c
index d6c0157e138cb2da89b8654a8dad5eb625dcc4a0..b6b0f36fd661e81ae2ab152ed0d66543301c014f 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -229,7 +229,7 @@ static int ich7_run_opcode(uint8_t nr, OPCODE op, uint32_t offset,
 {
 	int write_cmd = 0;
 	int timeout;
-	uint32_t temp32;
+	uint32_t temp32 = 0;
 	uint16_t temp16;
 	uint32_t a;