diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2025-01-10 15:20:30 -0500 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2025-01-10 15:20:30 -0500 |
| commit | 8bf10dfd7d0d8c0e6cdda176c461b3c5eba022ca (patch) | |
| tree | 14bedfed6855016b4b8e7d4ba686ab68d1d59fda /drivers/scsi/megaraid | |
| parent | d102c6d589c29c220fd11808381df11a4501647f (diff) | |
| parent | 3b2f56860b05bf0cea86af786fd9b7faa8fe3ef3 (diff) | |
| download | lwn-8bf10dfd7d0d8c0e6cdda176c461b3c5eba022ca.tar.gz lwn-8bf10dfd7d0d8c0e6cdda176c461b3c5eba022ca.zip | |
Merge branch '6.13/scsi-fixes' into 6.14/scsi-staging
Pull in fixes branch to resolve merge conflict in ufs-qcom.c.
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 b59713130a52..833153bfd07b 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; |