# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.494   -> 1.495  
#	drivers/usb/storage/isd200.c	1.12    -> 1.13   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/08/18	mdharm-usb@one-eyed-alien.net	1.495
# [PATCH] USB-storage: final abort handler cleanup, for real...
# 
# Whoops!  Accidentally introduced a typo.  This patch should fix the typo...
# it's designed to apply after the last one.
# --------------------------------------------
#
diff -Nru a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
--- a/drivers/usb/storage/isd200.c	Sun Aug 18 20:48:19 2002
+++ b/drivers/usb/storage/isd200.c	Sun Aug 18 20:48:19 2002
@@ -437,7 +437,7 @@
 	/* did we abort this command? */
 	if (atomic_read(&us->sm_state) == US_STATE_ABORTING) {
                 US_DEBUGP("isd200_transfer_partial(): transfer aborted\n");
-		return ISD200_TRANSFER_ABORTED;
+		return ISD200_TRANSPORT_ABORTED;
 	}
 
         /* uh oh... we have an error code, so something went wrong. */
@@ -583,7 +583,7 @@
     
 	/* did we abort this command? */
 	if (atomic_read(&us->sm_state) == US_STATE_ABORTING) {
-		return ISD200_TRANSFER_ABORTED;
+		return ISD200_TRANSPORT_ABORTED;
 	}
 
 	else if (result == -EPIPE) {
@@ -615,7 +615,7 @@
 				   &partial);
 	/* did we abort this command? */
 	if (atomic_read(&us->sm_state) == US_STATE_ABORTING) {
-		return ISD200_TRANSFER_ABORTED;
+		return ISD200_TRANSPORT_ABORTED;
 	}
 
         /* did the attempt to read the CSW fail? */
@@ -630,7 +630,7 @@
 
                 /* if the command was aborted, indicate that */
 		if (atomic_read(&us->sm_state) == US_STATE_ABORTING) {
-			return ISD200_TRANSFER_ABORTED;
+			return ISD200_TRANSPORT_ABORTED;
 		}
         
                 /* if it fails again, we need a reset and return an error*/