Fixes for 4.19

[thirdparty/kernel/stable-queue.git] / releases / 2.6.15.2 / fix-i2o_scsi-oops-on-abort.patch

From stable-bounces@linux.kernel.org Thu Jan 19 14:02:44 2006
Message-Id: <200601192201.k0JM141O030124@shell0.pdx.osdl.net>
To: theonetruekenny@yahoo.com, Markus.Lidel@shadowconnect.com,
        stable@kernel.org, mm-commits@vger.kernel.org
From: akpm@osdl.org
Date: Thu, 19 Jan 2006 14:03:04 -0800
Cc: 
Subject: Fix i2o_scsi oops on abort

From: Markus Lidel <Markus.Lidel@shadowconnect.com>

>From http://bugzilla.kernel.org/show_bug.cgi?id=5923

When a scsi command failed, an oops would result.

Back-to-back SMART queries would make the Seagate drives unhappy.  The
second SMART query would timeout, and the command would be aborted.

From: Markus Lidel <Markus.Lidel@shadowconnect.com>
Cc: Kenny Simpson <theonetruekenny@yahoo.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/message/i2o/i2o_scsi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.15.1.orig/drivers/message/i2o/i2o_scsi.c
+++ linux-2.6.15.1/drivers/message/i2o/i2o_scsi.c
@@ -729,7 +729,7 @@ static int i2o_scsi_abort(struct scsi_cm
 	       &msg->u.head[1]);
 	writel(i2o_cntxt_list_get_ptr(c, SCpnt), &msg->body[0]);
 
-	if (i2o_msg_post_wait(c, m, I2O_TIMEOUT_SCSI_SCB_ABORT))
+	if (!i2o_msg_post_wait(c, msg, I2O_TIMEOUT_SCSI_SCB_ABORT))
 		status = SUCCESS;
 
 	return status;