Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18139
b: refs/heads/master
c: 3c9757b
h: refs/heads/master
i:
  18137: a6f0c11
  18135: fe0e663
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jan 12, 2006
1 parent 566c376 commit 8c764d8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ed1705afb93409a3e345d653be9d263984aa5c1b
refs/heads/master: 3c9757b7c28161e073e7f408978b7ed01925924c
5 changes: 3 additions & 2 deletions trunk/drivers/scsi/NCR53C9x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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));

Expand All @@ -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;
Expand Down

0 comments on commit 8c764d8

Please sign in to comment.