[SCSI] libsas: fix mixed topology recovery
If we have a domain with sas and sata devices there may still be sas
recovery actions to take after peeling off the commands to send to
libata.
Reported-by: Andrzej Jakowski <andrzej.jakowski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 26a943e..40edf52 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -699,10 +699,9 @@
sas_enable_revalidation(sas_ha);
}
-int sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
- struct list_head *done_q)
+void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
+ struct list_head *done_q)
{
- int rtn = 0;
struct scsi_cmnd *cmd, *n;
struct ata_port *ap;
@@ -719,7 +718,6 @@
if (ap && ap != ddev->sata_dev.ap)
continue;
ap = ddev->sata_dev.ap;
- rtn = 1;
list_move(&cmd->eh_entry, &sata_q);
}
@@ -741,8 +739,6 @@
list_del_init(sata_q.next);
}
} while (ap);
-
- return rtn;
}
void sas_ata_schedule_reset(struct domain_device *dev)