Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / scsi / mpt3sas / mpt3sas_base.c

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index fc8c45e15235571bacff394a1e05dcb80cd53125..1b492e9a3e55ea2650fa4185ea3fa55187816b5d 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -7378,7 +7378,9 @@ _base_wait_for_iocstate(struct MPT3SAS_ADAPTER *ioc, int timeout)
                return -EFAULT;
        }
 
- issue_diag_reset:
+       return 0;
+
+issue_diag_reset:
        rc = _base_diag_reset(ioc);
        return rc;
 }