From cc36dc90f353368e26bc6d95b55c4c3b5660ffec Mon Sep 17 00:00:00 2001 From: "Kashyap, Desai" Date: Wed, 23 Sep 2009 17:32:06 +0530 Subject: [PATCH] --- yaml --- r: 173552 b: refs/heads/master c: 96b681c6ad3f2f5013c0ffc558969ee6ac8c450b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/mpt2sas/mpt2sas_base.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 24bd6f9d1777..5986e8d32868 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec6c2b43b08f29e08ed5440abae1ec18d80fa8b7 +refs/heads/master: 96b681c6ad3f2f5013c0ffc558969ee6ac8c450b diff --git a/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c b/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c index c3524bcefd54..84087cc2d772 100644 --- a/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c @@ -3545,11 +3545,11 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc) return r; pci_set_drvdata(ioc->pdev, ioc->shost); - r = _base_make_ioc_ready(ioc, CAN_SLEEP, SOFT_RESET); + r = _base_get_ioc_facts(ioc, CAN_SLEEP); if (r) goto out_free_resources; - r = _base_get_ioc_facts(ioc, CAN_SLEEP); + r = _base_make_ioc_ready(ioc, CAN_SLEEP, SOFT_RESET); if (r) goto out_free_resources;