aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptscsih.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/message/fusion/mptscsih.c')
-rw-r--r--drivers/message/fusion/mptscsih.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index c207bda6723b..89c63147a15d 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2304,14 +2304,14 @@ mptscsih_is_phys_disk(MPT_ADAPTER *ioc, u8 channel, u8 id)
2304 if (list_empty(&ioc->raid_data.inactive_list)) 2304 if (list_empty(&ioc->raid_data.inactive_list))
2305 goto out; 2305 goto out;
2306 2306
2307 down(&ioc->raid_data.inactive_list_mutex); 2307 mutex_lock(&ioc->raid_data.inactive_list_mutex);
2308 list_for_each_entry(component_info, &ioc->raid_data.inactive_list, 2308 list_for_each_entry(component_info, &ioc->raid_data.inactive_list,
2309 list) { 2309 list) {
2310 if ((component_info->d.PhysDiskID == id) && 2310 if ((component_info->d.PhysDiskID == id) &&
2311 (component_info->d.PhysDiskBus == channel)) 2311 (component_info->d.PhysDiskBus == channel))
2312 rc = 1; 2312 rc = 1;
2313 } 2313 }
2314 up(&ioc->raid_data.inactive_list_mutex); 2314 mutex_unlock(&ioc->raid_data.inactive_list_mutex);
2315 2315
2316 out: 2316 out:
2317 return rc; 2317 return rc;
@@ -2341,14 +2341,14 @@ mptscsih_raid_id_to_num(MPT_ADAPTER *ioc, u8 channel, u8 id)
2341 if (list_empty(&ioc->raid_data.inactive_list)) 2341 if (list_empty(&ioc->raid_data.inactive_list))
2342 goto out; 2342 goto out;
2343 2343
2344 down(&ioc->raid_data.inactive_list_mutex); 2344 mutex_lock(&ioc->raid_data.inactive_list_mutex);
2345 list_for_each_entry(component_info, &ioc->raid_data.inactive_list, 2345 list_for_each_entry(component_info, &ioc->raid_data.inactive_list,
2346 list) { 2346 list) {
2347 if ((component_info->d.PhysDiskID == id) && 2347 if ((component_info->d.PhysDiskID == id) &&
2348 (component_info->d.PhysDiskBus == channel)) 2348 (component_info->d.PhysDiskBus == channel))
2349 rc = component_info->d.PhysDiskNum; 2349 rc = component_info->d.PhysDiskNum;
2350 } 2350 }
2351 up(&ioc->raid_data.inactive_list_mutex); 2351 mutex_unlock(&ioc->raid_data.inactive_list_mutex);
2352 2352
2353 out: 2353 out:
2354 return rc; 2354 return rc;