Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762036AbYF0TGR (ORCPT ); Fri, 27 Jun 2008 15:06:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754355AbYF0TGE (ORCPT ); Fri, 27 Jun 2008 15:06:04 -0400 Received: from einhorn.in-berlin.de ([192.109.42.8]:51210 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753627AbYF0TGB convert rfc822-to-8bit (ORCPT ); Fri, 27 Jun 2008 15:06:01 -0400 X-Envelope-From: stefanr@s5r6.in-berlin.de Date: Fri, 27 Jun 2008 21:05:06 +0200 (CEST) From: Stefan Richter Subject: [GIT PULL] firewire update To: Linus Torvalds , Andrew Morton cc: linux-kernel@vger.kernel.org, linux1394-devel@lists.sourceforge.net Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=iso-8859-1 Content-Transfer-Encoding: 8BIT Content-Disposition: INLINE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1783 Lines: 51 Linus, please pull from the for-linus branch at git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus to receive the following one-liner. Richard Sharpe (1): firewire: fw-sbp2: fix parsing of logical unit directories drivers/firewire/fw-sbp2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 0e3e2eabf4fbc0162e1f1eb4fd90cb3e9513a554 Author: Richard Sharpe Date: Tue Jun 24 19:11:13 2008 -0700 firewire: fw-sbp2: fix parsing of logical unit directories There is a small off-by-one bug in firewire-sbp2. This causes problems when a device exports multiple LUN Directories. I found it when trying to talk to a SONY DVD Jukebox. Signed-off-by: Richard Sharpe Acked-by: Kristian H?gsberg Signed-off-by: Stefan Richter (op. order, changelog) diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index b2458bb..227d2e0 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; } -- Stefan Richter -=====-==--- -==- ==-== http://arcgraph.de/sr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/