---

yaml --- r: 307576 b: refs/heads/master c: d713dfa h: refs/heads/master v: v3
git-mirror · Apr 17, 2012 · ee42493 · ee42493
1 parent 09e51c8
commit ee42493
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b6c4857f7684f6d3f59e0506f62953575346978
+refs/heads/master: d713dfa708e14352cfb71342cf985d08fe14be95
diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c
@@ -1821,8 +1821,8 @@ static void bus_reset_work(struct work_struct *work)
 {
 	struct fw_ohci *ohci =
 		container_of(work, struct fw_ohci, bus_reset_work);
-	int self_id_count, i, j, reg;
-	int generation, new_generation;
+	int self_id_count, generation, new_generation, i, j;
+	u32 reg;
 	unsigned long flags;
 	void *free_rom = NULL;
 	dma_addr_t free_rom_bus = 0;