Commit dcaa9e30 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] wd33c93 SCSI merge error

Wd33c93 SCSI: Fix 2.5.64 merge error
parent f5daf5eb
...@@ -1471,7 +1471,7 @@ reset_wd33c93(struct Scsi_Host *instance) ...@@ -1471,7 +1471,7 @@ reset_wd33c93(struct Scsi_Host *instance)
int busycount = 0; int busycount = 0;
extern void sgiwd93_reset(unsigned long); extern void sgiwd93_reset(unsigned long);
/* wait 'til the chip gets some time for us */ /* wait 'til the chip gets some time for us */
while ((READ_AUX_STAT() & ASR_BSY) && busycount++ < 100) while ((read_aux_stat(regs) & ASR_BSY) && busycount++ < 100)
udelay (10); udelay (10);
/* /*
* there are scsi devices out there, which manage to lock up * there are scsi devices out there, which manage to lock up
...@@ -1481,7 +1481,7 @@ reset_wd33c93(struct Scsi_Host *instance) ...@@ -1481,7 +1481,7 @@ reset_wd33c93(struct Scsi_Host *instance)
* does this for the SGI Indy, where this is possible * does this for the SGI Indy, where this is possible
*/ */
/* still busy ? */ /* still busy ? */
if (READ_AUX_STAT() & ASR_BSY) if (read_aux_stat(regs) & ASR_BSY)
sgiwd93_reset(instance->base); /* yeah, give it the hard one */ sgiwd93_reset(instance->base); /* yeah, give it the hard one */
} }
#endif #endif
......
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