* [PATCH] wd33c93 SCSI merge error
@ 2003-03-19 12:29 Geert Uytterhoeven
0 siblings, 0 replies; only message in thread
From: Geert Uytterhoeven @ 2003-03-19 12:29 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Kernel Development, Geert Uytterhoeven
Wd33c93 SCSI: Fix 2.5.64 merge error
--- linux-2.5.x/drivers/scsi/wd33c93.c Sun Mar 9 22:40:15 2003
+++ linux-m68k-2.5.x/drivers/scsi/wd33c93.c Thu Mar 6 12:03:12 2003
@@ -1471,7 +1471,7 @@
int busycount = 0;
extern void sgiwd93_reset(unsigned long);
/* 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);
/*
* there are scsi devices out there, which manage to lock up
@@ -1481,7 +1481,7 @@
* does this for the SGI Indy, where this is possible
*/
/* 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 */
}
#endif
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-03-19 12:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-03-19 12:29 [PATCH] wd33c93 SCSI merge error Geert Uytterhoeven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).