diff options
author | Neil Brown <neilb@notabene.brown> | 2008-07-08 10:11:50 +1000 |
---|---|---|
committer | Neil Brown <neilb@notabene.brown> | 2008-07-08 10:11:50 +1000 |
commit | 5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (patch) | |
tree | a1f22225aace571661c29e59ebd024bc4619e054 /drivers/firewire | |
parent | 1fe797e67fb07d605b82300934d0de67068a0aca (diff) | |
parent | b7279469d66b55119784b8b9529c99c1955fe747 (diff) |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/firewire')
-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 b2458bb8e9c..227d2e036cd 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, break; case SBP2_CSR_LOGICAL_UNIT_DIRECTORY: - if (sbp2_scan_logical_unit_dir(tgt, ci.p + value) < 0) + /* Adjust for the increment in the iterator */ + if (sbp2_scan_logical_unit_dir(tgt, ci.p - 1 + value) < 0) return -ENOMEM; break; } |