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
Kirill Smelkov
linux
Commits
989e4d6c
Commit
989e4d6c
authored
Nov 21, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/scjody/ieee1394
parents
5ea8051a
963f48a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
drivers/ieee1394/sbp2.c
drivers/ieee1394/sbp2.c
+6
-0
No files found.
drivers/ieee1394/sbp2.c
View file @
989e4d6c
...
@@ -2350,6 +2350,7 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int dest
...
@@ -2350,6 +2350,7 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int dest
struct
scsi_cmnd
*
SCpnt
=
NULL
;
struct
scsi_cmnd
*
SCpnt
=
NULL
;
u32
scsi_status
=
SBP2_SCSI_STATUS_GOOD
;
u32
scsi_status
=
SBP2_SCSI_STATUS_GOOD
;
struct
sbp2_command_info
*
command
;
struct
sbp2_command_info
*
command
;
unsigned
long
flags
;
SBP2_DEBUG
(
"sbp2_handle_status_write"
);
SBP2_DEBUG
(
"sbp2_handle_status_write"
);
...
@@ -2451,9 +2452,11 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int dest
...
@@ -2451,9 +2452,11 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int dest
* null out last orb so that next time around we write directly to the orb pointer...
* null out last orb so that next time around we write directly to the orb pointer...
* Quick start saves one 1394 bus transaction.
* Quick start saves one 1394 bus transaction.
*/
*/
spin_lock_irqsave
(
&
scsi_id
->
sbp2_command_orb_lock
,
flags
);
if
(
list_empty
(
&
scsi_id
->
sbp2_command_orb_inuse
))
{
if
(
list_empty
(
&
scsi_id
->
sbp2_command_orb_inuse
))
{
scsi_id
->
last_orb
=
NULL
;
scsi_id
->
last_orb
=
NULL
;
}
}
spin_unlock_irqrestore
(
&
scsi_id
->
sbp2_command_orb_lock
,
flags
);
}
else
{
}
else
{
...
@@ -2563,9 +2566,11 @@ static void sbp2scsi_complete_all_commands(struct scsi_id_instance_data *scsi_id
...
@@ -2563,9 +2566,11 @@ static void sbp2scsi_complete_all_commands(struct scsi_id_instance_data *scsi_id
struct
sbp2scsi_host_info
*
hi
=
scsi_id
->
hi
;
struct
sbp2scsi_host_info
*
hi
=
scsi_id
->
hi
;
struct
list_head
*
lh
;
struct
list_head
*
lh
;
struct
sbp2_command_info
*
command
;
struct
sbp2_command_info
*
command
;
unsigned
long
flags
;
SBP2_DEBUG
(
"sbp2scsi_complete_all_commands"
);
SBP2_DEBUG
(
"sbp2scsi_complete_all_commands"
);
spin_lock_irqsave
(
&
scsi_id
->
sbp2_command_orb_lock
,
flags
);
while
(
!
list_empty
(
&
scsi_id
->
sbp2_command_orb_inuse
))
{
while
(
!
list_empty
(
&
scsi_id
->
sbp2_command_orb_inuse
))
{
SBP2_DEBUG
(
"Found pending command to complete"
);
SBP2_DEBUG
(
"Found pending command to complete"
);
lh
=
scsi_id
->
sbp2_command_orb_inuse
.
next
;
lh
=
scsi_id
->
sbp2_command_orb_inuse
.
next
;
...
@@ -2582,6 +2587,7 @@ static void sbp2scsi_complete_all_commands(struct scsi_id_instance_data *scsi_id
...
@@ -2582,6 +2587,7 @@ static void sbp2scsi_complete_all_commands(struct scsi_id_instance_data *scsi_id
command
->
Current_done
(
command
->
Current_SCpnt
);
command
->
Current_done
(
command
->
Current_SCpnt
);
}
}
}
}
spin_unlock_irqrestore
(
&
scsi_id
->
sbp2_command_orb_lock
,
flags
);
return
;
return
;
}
}
...
...
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