diff options
Diffstat (limited to 'drivers/usb/storage/isd200.c')
-rw-r--r-- | drivers/usb/storage/isd200.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c index 3addcd8f827b..383abf2516a5 100644 --- a/drivers/usb/storage/isd200.c +++ b/drivers/usb/storage/isd200.c | |||
@@ -1,7 +1,5 @@ | |||
1 | /* Transport & Protocol Driver for In-System Design, Inc. ISD200 ASIC | 1 | /* Transport & Protocol Driver for In-System Design, Inc. ISD200 ASIC |
2 | * | 2 | * |
3 | * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $ | ||
4 | * | ||
5 | * Current development and maintenance: | 3 | * Current development and maintenance: |
6 | * (C) 2001-2002 Björn Stenberg (bjorn@haxx.se) | 4 | * (C) 2001-2002 Björn Stenberg (bjorn@haxx.se) |
7 | * | 5 | * |
@@ -586,7 +584,7 @@ static void isd200_invoke_transport( struct us_data *us, | |||
586 | /* if the command gets aborted by the higher layers, we need to | 584 | /* if the command gets aborted by the higher layers, we need to |
587 | * short-circuit all other processing | 585 | * short-circuit all other processing |
588 | */ | 586 | */ |
589 | if (test_bit(US_FLIDX_TIMED_OUT, &us->flags)) { | 587 | if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) { |
590 | US_DEBUGP("-- command was aborted\n"); | 588 | US_DEBUGP("-- command was aborted\n"); |
591 | goto Handle_Abort; | 589 | goto Handle_Abort; |
592 | } | 590 | } |
@@ -633,7 +631,7 @@ static void isd200_invoke_transport( struct us_data *us, | |||
633 | 631 | ||
634 | if (need_auto_sense) { | 632 | if (need_auto_sense) { |
635 | result = isd200_read_regs(us); | 633 | result = isd200_read_regs(us); |
636 | if (test_bit(US_FLIDX_TIMED_OUT, &us->flags)) { | 634 | if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) { |
637 | US_DEBUGP("-- auto-sense aborted\n"); | 635 | US_DEBUGP("-- auto-sense aborted\n"); |
638 | goto Handle_Abort; | 636 | goto Handle_Abort; |
639 | } | 637 | } |
@@ -663,7 +661,7 @@ static void isd200_invoke_transport( struct us_data *us, | |||
663 | srb->result = DID_ABORT << 16; | 661 | srb->result = DID_ABORT << 16; |
664 | 662 | ||
665 | /* permit the reset transfer to take place */ | 663 | /* permit the reset transfer to take place */ |
666 | clear_bit(US_FLIDX_ABORTING, &us->flags); | 664 | clear_bit(US_FLIDX_ABORTING, &us->dflags); |
667 | /* Need reset here */ | 665 | /* Need reset here */ |
668 | } | 666 | } |
669 | 667 | ||