From 4e764a0362cf62d2437e9af2759602d80f3c5a00 Mon Sep 17 00:00:00 2001 From: Luben Tuikov Date: Tue, 26 Jul 2011 23:10:48 -0700 Subject: [PATCH] --- yaml --- r: 261713 b: refs/heads/master c: 5911e963d3718e306bcac387b83e259aa4228896 h: refs/heads/master i: 261711: af70a55229013c3aed24e43c5fdc04ee4b5030a0 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libsas/sas_expander.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 570df2473ad9..ffc4f65cbf4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e17035851ab8417bda890ab1e77f5ca121bbaa0b +refs/heads/master: 5911e963d3718e306bcac387b83e259aa4228896 diff --git a/trunk/drivers/scsi/libsas/sas_expander.c b/trunk/drivers/scsi/libsas/sas_expander.c index 874e29d9533f..f84084bba2f0 100644 --- a/trunk/drivers/scsi/libsas/sas_expander.c +++ b/trunk/drivers/scsi/libsas/sas_expander.c @@ -849,6 +849,9 @@ static struct domain_device *sas_ex_discover_expander( res = sas_discover_expander(child); if (res) { + spin_lock_irq(&parent->port->dev_list_lock); + list_del(&child->dev_list_node); + spin_unlock_irq(&parent->port->dev_list_lock); kfree(child); return NULL; }