diff options
Diffstat (limited to 'drivers/scsi/sun3_NCR5380.c')
-rw-r--r-- | drivers/scsi/sun3_NCR5380.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c index dc15a22105f7..2dcde373b20e 100644 --- a/drivers/scsi/sun3_NCR5380.c +++ b/drivers/scsi/sun3_NCR5380.c | |||
@@ -272,8 +272,7 @@ static struct scsi_host_template *the_template = NULL; | |||
272 | #define HOSTNO instance->host_no | 272 | #define HOSTNO instance->host_no |
273 | #define H_NO(cmd) (cmd)->device->host->host_no | 273 | #define H_NO(cmd) (cmd)->device->host->host_no |
274 | 274 | ||
275 | #define SGADDR(buffer) (void *)(((unsigned long)page_address((buffer)->page)) + \ | 275 | #define SGADDR(buffer) (void *)(((unsigned long)sg_virt(((buffer))))) |
276 | (buffer)->offset) | ||
277 | 276 | ||
278 | #ifdef SUPPORT_TAGS | 277 | #ifdef SUPPORT_TAGS |
279 | 278 | ||
@@ -1596,7 +1595,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd, | |||
1596 | * IO while SEL is true. But again, there are some disks out the in the | 1595 | * IO while SEL is true. But again, there are some disks out the in the |
1597 | * world that do that nevertheless. (Somebody claimed that this announces | 1596 | * world that do that nevertheless. (Somebody claimed that this announces |
1598 | * reselection capability of the target.) So we better skip that test and | 1597 | * reselection capability of the target.) So we better skip that test and |
1599 | * only wait for BSY... (Famous german words: Der Klügere gibt nach :-) | 1598 | * only wait for BSY... (Famous german words: Der Klügere gibt nach :-) |
1600 | */ | 1599 | */ |
1601 | 1600 | ||
1602 | while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) & | 1601 | while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) & |