[PATCH] 2.5 scsi changes : qlogicfas.c fixed (resend)

This patch allows my qlogic pcmcia scsi card to compile again, as broken
by the recent scsi layer changes.

Despite davem's apparent suggestion that it'd be better to rewrite the
driver, i'd rather not _just_ right now :)

	/ Brett Pemberton

diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c
index 8a0276a319bc73910243ca53a77866e520a0ea59..9a96c900c0c09c71080e4e278c9c164b7c3aa19f 100644 (file)
--- a/drivers/scsi/qlogicfas.c
+++ b/drivers/scsi/qlogicfas.c
@@ -344,6 +344,7 @@ unsigned int        phase;                  /* recorded scsi phase */
 unsigned int   reqlen;                 /* total length of transfer */
 struct scatterlist     *sglist;        /* scatter-gather list pointer */
 unsigned int   sgcount;                /* sg counter */
+char *buf;
 
 rtrc(1)
        j = inb(qbase + 6);
@@ -391,7 +392,8 @@ rtrc(2)
                                        REG0;
                                        return ((qabort == 1 ? DID_ABORT : DID_RESET) << 16);
                                }
-                               if (ql_pdma(phase, sglist->address, sglist->length))
+                               buf = page_address(sglist->page) + sglist->offset;
+                               if (ql_pdma(phase, buf, sglist->length))
                                        break;
                                sglist++;
                        }