narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[scsi] Use intfs_shutdown() when shutting down multiple interfaces 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/58/merge
Michael Brown 2017-03-09 12:16:35 +00:00
parent a29bdb3a92
commit 7ff3fc7c72
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers/block/scsi.c
View File

@ -394,8 +394,7 @@ static void scsicmd_close ( struct scsi_command *scsicmd, int rc ) {
} }
/* Shut down interfaces */ /* Shut down interfaces */
intf_shutdown ( &scsicmd->scsi, rc ); intfs_shutdown ( rc, &scsicmd->scsi, &scsicmd->block, NULL );
intf_shutdown ( &scsicmd->block, rc );
} }
/** /**
@ -840,9 +839,8 @@ static void scsidev_close ( struct scsi_device *scsidev, int rc ) {
process_del ( &scsidev->process ); process_del ( &scsidev->process );
/* Shut down interfaces */ /* Shut down interfaces */
intf_shutdown ( &scsidev->block, rc ); intfs_shutdown ( rc, &scsidev->block, &scsidev->scsi, &scsidev->ready,
intf_shutdown ( &scsidev->scsi, rc ); NULL );
intf_shutdown ( &scsidev->ready, rc );
/* Shut down any remaining commands */ /* Shut down any remaining commands */
list_for_each_entry_safe ( scsicmd, tmp, &scsidev->cmds, list ) { list_for_each_entry_safe ( scsicmd, tmp, &scsidev->cmds, list ) {