From: Jay Fenlason Date: Thu, 16 Oct 2008 19:51:59 +0000 (-0400) Subject: firewire: Survive more than 256 bus resets X-Git-Tag: v2.6.28-rc3~96^2~5 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4f9740d4f5a17fa6a1b097fa3ccdfb7246660307;p=linux-2.6-omap-h63xx.git firewire: Survive more than 256 bus resets The "color" is used during the topology building after a bus reset, hovever in "struct fw_node"s it is stored in a u8, but in struct fw_card it is stored in an int. When the value wraps in one struct, but not the other, disaster strikes. Signed-off-by: Jay Fenlason Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10922. Signed-off-by: Stefan Richter --- diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h index 027f58ce81a..aed7dbb17cd 100644 --- a/drivers/firewire/fw-transaction.h +++ b/drivers/firewire/fw-transaction.h @@ -248,7 +248,7 @@ struct fw_card { struct fw_node *local_node; struct fw_node *root_node; struct fw_node *irm_node; - int color; + u8 color; /* must be u8 to match the definition in struct fw_node */ int gap_count; bool beta_repeaters_present;