diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 15:20:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 15:20:11 -0400 |
| commit | 0b20715f3f83141ab5a2bb14b844b7c3c8bcf1aa (patch) | |
| tree | ea8c58388434288f87459c642e4437b0f741e0d6 | |
| parent | 747606464bc1eb1a2c3588b3b06ef7538f12deac (diff) | |
| parent | 0e3e2eabf4fbc0162e1f1eb4fd90cb3e9513a554 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fw-sbp2: fix parsing of logical unit directories
| -rw-r--r-- | drivers/firewire/fw-sbp2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index b2458bb8e9ca..227d2e036cd8 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c | |||
| @@ -1051,7 +1051,8 @@ static int sbp2_scan_unit_dir(struct sbp2_target *tgt, u32 *directory, | |||
| 1051 | break; | 1051 | break; |
| 1052 | 1052 | ||
| 1053 | case SBP2_CSR_LOGICAL_UNIT_DIRECTORY: | 1053 | case SBP2_CSR_LOGICAL_UNIT_DIRECTORY: |
| 1054 | if (sbp2_scan_logical_unit_dir(tgt, ci.p + value) < 0) | 1054 | /* Adjust for the increment in the iterator */ |
| 1055 | if (sbp2_scan_logical_unit_dir(tgt, ci.p - 1 + value) < 0) | ||
| 1055 | return -ENOMEM; | 1056 | return -ENOMEM; |
| 1056 | break; | 1057 | break; |
| 1057 | } | 1058 | } |