From 6de19a4161486bc2f9ef5c727050906383e176c8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 22 Dec 2011 14:58:24 -0800 Subject: [PATCH] --- yaml --- r: 293007 b: refs/heads/master c: cb48d672bfeb4147f3e20d5b16fa2eb6377231e2 h: refs/heads/master i: 293005: d4c6f3201d584cb6685d595b494701880d0f7820 293003: 5ffa99b5add84efe587a17552524cd40a7844e7a 292999: 90d573867ed25a3cedaae6649f8e7e42bcb17215 292991: 916ef954cfedc5b7acf4286d9747ef8c6158ee6a v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libsas/sas_ata.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d8173f5dfd71..db49737fd48c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f41a0c441c3fe43e79ebeb75584dbb5bfa83e5cd +refs/heads/master: cb48d672bfeb4147f3e20d5b16fa2eb6377231e2 diff --git a/trunk/drivers/scsi/libsas/sas_ata.c b/trunk/drivers/scsi/libsas/sas_ata.c index 92f7e78a096c..0cb538f8478a 100644 --- a/trunk/drivers/scsi/libsas/sas_ata.c +++ b/trunk/drivers/scsi/libsas/sas_ata.c @@ -326,6 +326,9 @@ static int sas_ata_hard_reset(struct ata_link *link, unsigned int *class, struct domain_device *dev = ap->private_data; struct sas_internal *i = dev_to_sas_internal(dev); + if (test_bit(SAS_DEV_GONE, &dev->state)) + return -ENODEV; + res = i->dft->lldd_I_T_nexus_reset(dev); if (res != TMF_RESP_FUNC_COMPLETE)