diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 01:06:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 09:09:05 -0800 |
| commit | 3c9757b7c28161e073e7f408978b7ed01925924c (patch) | |
| tree | bcaa65fc847c5053453645a6e0e19c5f3581f0f3 /drivers/scsi | |
| parent | ed1705afb93409a3e345d653be9d263984aa5c1b (diff) | |
| download | linux-3.10-3c9757b7c28161e073e7f408978b7ed01925924c.tar.gz linux-3.10-3c9757b7c28161e073e7f408978b7ed01925924c.tar.bz2 linux-3.10-3c9757b7c28161e073e7f408978b7ed01925924c.zip | |
[PATCH] m68k: fix PIO case in esp
we always set ->SCp.ptr to physical address of buffer; for DMA that's
just what we need, but we end up using it as virtual address in PIO
case of esp_do_data(), with obvious breakage as soon as memory mapping
becomes non-trivial. The fix is obvious.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/NCR53C9x.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c index 640590bd014..c7dd0154d01 100644 --- a/drivers/scsi/NCR53C9x.c +++ b/drivers/scsi/NCR53C9x.c @@ -1799,6 +1799,7 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs) */ int oldphase, i = 0; /* or where we left off last time ?? esp->current_data ?? */ int fifocnt = 0; + unsigned char *p = phys_to_virt((unsigned long)SCptr->SCp.ptr); oldphase = esp_read(eregs->esp_status) & ESP_STAT_PMASK; @@ -1860,7 +1861,7 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs) /* read fifo */ for(j=0;j<fifocnt;j++) - SCptr->SCp.ptr[i++] = esp_read(eregs->esp_fdata); + p[i++] = esp_read(eregs->esp_fdata); ESPDATA(("(%d) ", i)); @@ -1882,7 +1883,7 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs) /* fill fifo */ for(j=0;j<this_count;j++) - esp_write(eregs->esp_fdata, SCptr->SCp.ptr[i++]); + esp_write(eregs->esp_fdata, p[i++]); /* how many left if this goes out ?? */ hmuch -= this_count; |