X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Ffirewire%2Fohci.c;h=5d524254499ed154b6585c328e6b5a88413792db;hb=0dd52d0df02733dfc2d5f3824e41b96492305384;hp=76b321bb73f9419aa52c826a944047388d53cd0a;hpb=7ef0143e2f898f9bf675c81bdf0e045c8dd53c57;p=cascardo%2Flinux.git

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 76b321bb73f9..5d524254499e 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -1279,8 +1279,8 @@ static void bus_reset_tasklet(unsigned long data)
 	 * the inverted quadlets and a header quadlet, we shift one
 	 * bit extra to get the actual number of self IDs.
 	 */
-	self_id_count = (reg >> 3) & 0x3ff;
-	if (self_id_count == 0) {
+	self_id_count = (reg >> 3) & 0xff;
+	if (self_id_count == 0 || self_id_count > 252) {
 		fw_notify("inconsistent self IDs\n");
 		return;
 	}