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)