---

yaml
---
r: 185099
b: refs/heads/master
c: 2799d5c
h: refs/heads/master
i:
  185097: 929a48d
  185095: b03156b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d54423c62c2f687919d4e5bdd4bb064234ff2d44
+refs/heads/master: 2799d5c5f9d2064c6d1f50ec82e28e3eac5f6954

trunk/drivers/firewire/core-device.c

@@ -588,15 +588,19 @@ static int read_bus_info_block(struct fw_device *device, int generation)
 		if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE)
 			goto out;
 		end = i + (rom[i] >> 16) + 1;
-		i++;
-		if (end > READ_BIB_ROM_SIZE)
+		if (end > READ_BIB_ROM_SIZE) {
 			/*
-			 * This block extends outside standard config
-			 * area (and the array we're reading it
-			 * into).  That's broken, so ignore this
-			 * device.
+			 * This block extends outside the config ROM which is
+			 * a firmware bug.  Ignore this whole block, i.e.
+			 * simply set a fake block length of 0.
 			 */
-			goto out;
+			fw_error("skipped invalid ROM block %x at %llx\n",
+				 rom[i],
+				 i * 4 | CSR_REGISTER_BASE | CSR_CONFIG_ROM);
+			rom[i] = 0;
+			end = i;
+		}
+		i++;
 
 		/*
 		 * Now read in the block.  If this is a directory