Commit 9c2676b6 authored Aug 29, 2008 by Tejun Heo Committed by Jeff Garzik Sep 08, 2008

libata-sff: kill spurious WARN_ON() in ata_hsm_move()



On HSM_ST_ERR, ata_hsm_move() triggers WARN_ON() if AC_ERR_DEV or
AC_ERR_HSM is not set.  PHY events may trigger HSM_ST_ERR with other
error codes and, with or without it, there just isn't much reason to
do WARN_ON() on it.  Even if error code is not set there, core EH
logic won't have any problem dealing with the error condition.

OSDL bz#11065 reports this problem.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

parent 2fd673ec

drivers/ata/libata-sff.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1315,11 +1315,6 @@ int ata_sff_hsm_move(struct ata_port ap, struct ata_queued_cmd qc,
	break;		break;

	case HSM_ST_ERR:		case HSM_ST_ERR:
	/* make sure qc->err_mask is available to
	* know what's wrong and recover
	*/
	WARN_ON(!(qc->err_mask & (AC_ERR_DEV \| AC_ERR_HSM)));

	ap->hsm_task_state = HSM_ST_IDLE;		ap->hsm_task_state = HSM_ST_IDLE;

	/* complete taskfile transaction */		/* complete taskfile transaction */