Commit dde3d25b authored by Brett Pemberton's avatar Brett Pemberton Committed by Linus Torvalds

[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
parent 5a22d00c
...@@ -344,6 +344,7 @@ unsigned int phase; /* recorded scsi phase */ ...@@ -344,6 +344,7 @@ unsigned int phase; /* recorded scsi phase */
unsigned int reqlen; /* total length of transfer */ unsigned int reqlen; /* total length of transfer */
struct scatterlist *sglist; /* scatter-gather list pointer */ struct scatterlist *sglist; /* scatter-gather list pointer */
unsigned int sgcount; /* sg counter */ unsigned int sgcount; /* sg counter */
char *buf;
rtrc(1) rtrc(1)
j = inb(qbase + 6); j = inb(qbase + 6);
...@@ -391,7 +392,8 @@ rtrc(2) ...@@ -391,7 +392,8 @@ rtrc(2)
REG0; REG0;
return ((qabort == 1 ? DID_ABORT : DID_RESET) << 16); 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; break;
sglist++; sglist++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment