Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
dcaa9e30
Commit
dcaa9e30
authored
Mar 20, 2003
by
Geert Uytterhoeven
Committed by
Linus Torvalds
Mar 20, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] wd33c93 SCSI merge error
Wd33c93 SCSI: Fix 2.5.64 merge error
parent
f5daf5eb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
drivers/scsi/wd33c93.c
drivers/scsi/wd33c93.c
+2
-2
No files found.
drivers/scsi/wd33c93.c
View file @
dcaa9e30
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment