aacraid: do not overwrite retval in aac_reset_adapter()
Subsystems (2)
PATCH 1/1 aacraid: do not overwrite retval in aac_reset_adapter()
'retval' got assigned a value twice, causing the original value to be lost.
Fixes 3d3ca53b1639 ("scsi: aacraid: use scsi_host_(block,unblock) to block I/O")
Reported-by Martin K. Petersen <[email protected]>
Signed-off-by Hannes Reinecke <[email protected]>
--- drivers/scsi/aacraid/commsup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/aacraid/commsup.c +4 -3
@@ -1626,7 +1626,7 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)int aac_reset_adapter (struct aac_dev *aac,int forced,u8 reset_type) {unsigned long flagv =0 ; -int retval; +int retval, unblock_retval;struct Scsi_Host *host = aac->scsi_host_ptr;int bled;
@@ -1656,8 +1656,9 @@ int aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) retval =_aac_reset_adapter (aac, bled, reset_type);spin_unlock_irqrestore (host->host_lock, flagv); - retval =scsi_host_unblock (host,SDEV_RUNNING ); - + unblock_retval =scsi_host_unblock (host,SDEV_RUNNING ); +if (!retval) + retval = unblock_retval;if ((forced <2 ) && (retval == -ENODEV )) {/* Unwind aac_send_shutdown() IOP_RESET unsupported/disabled */ struct fib * fibctx =aac_fib_alloc (aac);
Signature · 1 line
2.16.4
Martin K. Petersen
AppliedHannes,
Quoted 2 lines
'retval' got assigned a value twice, causing the original value to be lost.
Applied to 5.7/scsi-queue, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering