fujitsu-laptop: Add DMI callback for Lifebook S6420

[linux-2.6-omap-h63xx.git] / drivers / usb / storage / isd200.c

diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 3addcd8f827bd3d17463dbc67395c072cfae4d81..383abf2516a520a6756c99349a854fb9ee89a2ab 100644 (file)
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1,6 +1,4 @@
 /* Transport & Protocol Driver for In-System Design, Inc. ISD200 ASIC
- *
- * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $
  *
  * Current development and maintenance:
  *   (C) 2001-2002 Björn Stenberg (bjorn@haxx.se)
@@ -586,7 +584,7 @@ static void isd200_invoke_transport( struct us_data *us,
        /* if the command gets aborted by the higher layers, we need to
         * short-circuit all other processing
         */
-       if (test_bit(US_FLIDX_TIMED_OUT, &us->flags)) {
+       if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) {
                US_DEBUGP("-- command was aborted\n");
                goto Handle_Abort;
        }
@@ -633,7 +631,7 @@ static void isd200_invoke_transport( struct us_data *us,
 
        if (need_auto_sense) {
                result = isd200_read_regs(us);
-               if (test_bit(US_FLIDX_TIMED_OUT, &us->flags)) {
+               if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) {
                        US_DEBUGP("-- auto-sense aborted\n");
                        goto Handle_Abort;
                }
@@ -663,7 +661,7 @@ static void isd200_invoke_transport( struct us_data *us,
        srb->result = DID_ABORT << 16;
 
        /* permit the reset transfer to take place */
-       clear_bit(US_FLIDX_ABORTING, &us->flags);
+       clear_bit(US_FLIDX_ABORTING, &us->dflags);
        /* Need reset here */
 }