Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index f608d4a1d6da..792b2e807bf3 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -674,12 +674,13 @@ static struct orc_scb *__orc_alloc_scb(struct orc_host * host)
                 for (index = 0; index < 32; index++) {
                         if ((host->allocation_map[channel][i] >> index) & 0x01) {
                                 host->allocation_map[channel][i] &= ~(1 << index);
-                                break;
+                                idx = index + 32 * i;
+                                /*
+                                 * Translate the index to a structure instance
+                                 */
+                                return host->scb_virt + idx;
                         }
                 }
-                idx = index + 32 * i;
-                /* Translate the index to a structure instance */
-                return (struct orc_scb *) ((unsigned long) host->scb_virt + (idx * sizeof(struct orc_scb)));
         }
         return NULL;
 }