diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 14:25:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 14:25:40 -0700 |
| commit | 0b2cad2f30d0353f2576b1a2207c0792ba713157 (patch) | |
| tree | 0d7f73fcc961111ddca915cc8f267ebb088a04c2 /drivers/usb | |
| parent | 238628edb6cd427454fb54994e2605e191bfc26a (diff) | |
| parent | 686579d95d48c713bdb7008cc76af8398219e687 (diff) | |
Merge SCSI tree from James Bottomley.
Done with "git-pull-script rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git"
together with an automated content merge.
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/image/microtek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index de0d32f6618..cab89a970c7 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c @@ -335,7 +335,7 @@ static int mts_scsi_abort (Scsi_Cmnd *srb) mts_urb_abort(desc); - return SCSI_ABORT_PENDING; + return FAILURE; } static int mts_scsi_host_reset (Scsi_Cmnd *srb) |