diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-06-18 11:59:01 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-06-18 11:59:01 -0700 |
| commit | 951d77fd5a541d68eeb7372e72cd4757e3058517 (patch) | |
| tree | 74ddfe541cc01e61dbcaf946b604c01863637c65 /drivers/ata | |
| parent | 27ea13e6186c1a5bd0fa2b0d6f854d60ca4ca4c9 (diff) | |
| parent | 8beb330044d0d1878c7b92290e91c0b889e92633 (diff) | |
| download | op-kernel-dev-951d77fd5a541d68eeb7372e72cd4757e3058517.zip op-kernel-dev-951d77fd5a541d68eeb7372e72cd4757e3058517.tar.gz | |
Merge remote-tracking branch 'mkp-scsi/4.7/scsi-fixes' into fixes
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-eh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 61dc7a9..c6f0174 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -606,7 +606,7 @@ void ata_scsi_error(struct Scsi_Host *host) ata_scsi_port_error_handler(host, ap); /* finish or retry handled scmd's and clean up */ - WARN_ON(host->host_failed || !list_empty(&eh_work_q)); + WARN_ON(!list_empty(&eh_work_q)); DPRINTK("EXIT\n"); } |
