diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2024-12-02 12:36:18 -0500 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2024-12-02 12:36:18 -0500 |
| commit | e7d3b4079d01c60568a45237224df4447f140189 (patch) | |
| tree | 23faea3aca75215065e0e49d379fa349a0070d5a /drivers/scsi/megaraid | |
| parent | 40384c840ea1944d7c5a392e8975ed088ecf0b37 (diff) | |
| parent | 019880c08d059f214327fd0dc92e9be3707286f2 (diff) | |
| download | linux-e7d3b4079d01c60568a45237224df4447f140189.tar.gz linux-e7d3b4079d01c60568a45237224df4447f140189.tar.bz2 linux-e7d3b4079d01c60568a45237224df4447f140189.zip | |
Merge branch '6.13/scsi-queue' into 6.13/scsi-fixes
Pull in outstanding changes from 6.13/scsi-queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/megaraid')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 8e75e2e279a4..50f1dcb6d584 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -8907,8 +8907,11 @@ megasas_aen_polling(struct work_struct *work) (ld_target_id / MEGASAS_MAX_DEV_PER_CHANNEL), (ld_target_id % MEGASAS_MAX_DEV_PER_CHANNEL), 0); - if (sdev1) + if (sdev1) { + mutex_unlock(&instance->reset_mutex); megasas_remove_scsi_device(sdev1); + mutex_lock(&instance->reset_mutex); + } event_type = SCAN_VD_CHANNEL; break; |