From c705758d2071836ec5f4ac627b3af9f5c162cb14 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 11 Jan 2007 14:15:03 -0800 Subject: [PATCH] --- yaml --- r: 47729 b: refs/heads/master c: cde3f74bac3e4a6bcdc3a6370af38179fd8ef1f2 h: refs/heads/master i: 47727: c7a6b9ad5e60d4a8a47744cea79b7b2c6d0e8e6d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libsas/sas_init.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 532479efbd22..cc8082a0c370 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d4dcd4dae25c48e8932326aaedfe560d7f2c7bb +refs/heads/master: cde3f74bac3e4a6bcdc3a6370af38179fd8ef1f2 diff --git a/trunk/drivers/scsi/libsas/sas_init.c b/trunk/drivers/scsi/libsas/sas_init.c index 90cce34cb6f5..4df73d69bb3c 100644 --- a/trunk/drivers/scsi/libsas/sas_init.c +++ b/trunk/drivers/scsi/libsas/sas_init.c @@ -127,12 +127,13 @@ int sas_register_ha(struct sas_ha_struct *sas_ha) int sas_unregister_ha(struct sas_ha_struct *sas_ha) { + sas_unregister_ports(sas_ha); + if (sas_ha->lldd_max_execute_num > 1) { sas_shutdown_queue(sas_ha); + sas_ha->lldd_max_execute_num = 1; } - sas_unregister_ports(sas_ha); - return 0; }