From: Xiang Chen <chenxiang66@hisilicon.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ID9GQH -------------------------------- Upstream: No delete sas port out of the disco mutex Signed-off-by: Jason Yan <yanaijie@huawei.com> DTS:DTS2019032908508 Description:libsas: delete sas port out of the disco mutex Team:HISI_SW Feature or Bugfix:Bugfix Change-Id: I620775c266273577ea3a7e373904c292870a0f15 Signed-off-by: c00284940 <c00284940@huawei.com> Reviewed-on: http://10.90.31.173:8080/5908 Tested-by: public TuringEE <turingee@huawei.com> Reviewed-by: tanxiaofei 00396350 <tanxiaofei@huawei.com> Reviewed-by: public TuringEE <turingee@huawei.com> Signed-off-by: x00470154 <x00470154@huawei.com> Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com> --- drivers/scsi/libsas/sas_expander.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 1945def5d78d..48f1ef4ca524 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -931,7 +931,7 @@ static struct domain_device *sas_ex_discover_end_dev( spin_unlock_irq(&parent->port->dev_list_lock); out_free: dev_printk(KERN_INFO, &phy->port->dev, "port deleted due to failed discover\n"); - sas_port_delete(phy->port); + list_add_tail(&phy->port->del_list, &parent->port->sas_port_del_list); out_err: phy->port = NULL; sas_put_device(child); -- 2.46.1