Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
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
struct
scsi_cmnd
*
SCpnt
=
NULL
;
u32
scsi_status
=
SBP2_SCSI_STATUS_GOOD
;
struct
sbp2_command_info
*
command
;
unsigned
long
flags
;
SBP2_DEBUG
(
"sbp2_handle_status_write"
);
...
...
@@ -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...
* 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
))
{
scsi_id
->
last_orb
=
NULL
;
}
spin_unlock_irqrestore
(
&
scsi_id
->
sbp2_command_orb_lock
,
flags
);
}
else
{
...
...
@@ -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
list_head
*
lh
;
struct
sbp2_command_info
*
command
;
unsigned
long
flags
;
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
))
{
SBP2_DEBUG
(
"Found pending command to complete"
);
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
command
->
Current_done
(
command
->
Current_SCpnt
);
}
}
spin_unlock_irqrestore
(
&
scsi_id
->
sbp2_command_orb_lock
,
flags
);
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