From 3e0d354b3eca741193b346a29bfecbe7c0bb5ff6 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 23 Apr 2008 20:48:36 +0900 Subject: [PATCH] --- yaml --- r: 93385 b: refs/heads/master c: 411cb3869afd91ed40e8f12df64cd9e315356305 h: refs/heads/master i: 93383: 324f654fd8f6e9af8af005dcd0cce8000faa7da8 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-sff.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9caf9f75664d..06151a9dd92e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 458622fcdc5b316de8d74efd7e610803f0308c14 +refs/heads/master: 411cb3869afd91ed40e8f12df64cd9e315356305 diff --git a/trunk/drivers/ata/libata-sff.c b/trunk/drivers/ata/libata-sff.c index 15499522e642..2ec65a8fda79 100644 --- a/trunk/drivers/ata/libata-sff.c +++ b/trunk/drivers/ata/libata-sff.c @@ -1208,7 +1208,7 @@ int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, DPRINTK("ata%u: dev %u command complete, drv_stat 0x%x\n", ap->print_id, qc->dev->devno, status); - WARN_ON(qc->err_mask); + WARN_ON(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM)); ap->hsm_task_state = HSM_ST_IDLE; @@ -1222,7 +1222,7 @@ int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, /* make sure qc->err_mask is available to * know what's wrong and recover */ - WARN_ON(qc->err_mask == 0); + WARN_ON(!(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM))); ap->hsm_task_state = HSM_ST_IDLE;