diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 3f8661a..8d7c121 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -100,11 +100,12 @@
 	i = 5;
 	config_rom[i++] = 0;
 	config_rom[i++] = 0x0c0083c0; /* node capabilities */
-	config_rom[i++] = 0x03d00d1e; /* vendor id */
 	j = i + descriptor_count;
 
 	/* Generate root directory entries for descriptors. */
 	list_for_each_entry (desc, &descriptor_list, link) {
+		if (desc->immediate > 0)
+			config_rom[i++] = desc->immediate;
 		config_rom[i] = desc->key | (j - i);
 		i++;
 		j += desc->length;
@@ -165,6 +166,8 @@
 
 	list_add_tail (&desc->link, &descriptor_list);
 	descriptor_count++;
+	if (desc->immediate > 0)
+		descriptor_count++;
 	update_config_roms();
 
 	up_write(&fw_bus_type.subsys.rwsem);
@@ -180,6 +183,8 @@
 
 	list_del(&desc->link);
 	descriptor_count--;
+	if (desc->immediate > 0)
+		descriptor_count--;
 	update_config_roms();
 
 	up_write(&fw_bus_type.subsys.rwsem);