projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[cascardo/linux.git]
/
drivers
/
firewire
/
ohci.c
diff --git
a/drivers/firewire/ohci.c
b/drivers/firewire/ohci.c
index
76b321b
..
5d52425
100644
(file)
--- 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.
*/
* 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) & 0x
3
ff;
- 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;
}
fw_notify("inconsistent self IDs\n");
return;
}