Commit b0cf0b11 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Linus Torvalds
Browse files

cciss: fix incorrect scsi status reporting 



Delete code which sets SCSI status incorrectly as it's already been set
correctly above this incorrect code.  The bug was introduced in 2009 by
commit b0e15f6d ("cciss: fix typo that causes scsi status to be
lost.")

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Reported-by: default avatarRoel van Meer <roel.vanmeer@bokxing.nl>
Tested-by: default avatarRoel van Meer <roel.vanmeer@bokxing.nl>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d65226e2

drivers/block/cciss_scsi.c

+1 −10
Original line number Diff line number Diff line
@@ -763,16 +763,7 @@ static void complete_scsi_command(CommandList_struct *c, int timeout, 
		{

			case CMD_TARGET_STATUS:

				/* Pass it up to the upper layers... */

				if( ei->ScsiStatus)

                		{

#if 0

                    			printk(KERN_WARNING "cciss: cmd %p "

						"has SCSI Status = %x\n",

						c, ei->ScsiStatus);

#endif

					cmd->result |= (ei->ScsiStatus << 1);

                		}

				else {  /* scsi status is zero??? How??? */

				if (!ei->ScsiStatus) {

					

	/* Ordinarily, this case should never happen, but there is a bug

	   in some released firmware revisions that allows it to happen