diff options
author | James Bottomley <jejb@titanic> | 2005-04-18 13:45:00 -0500 |
---|---|---|
committer | James Bottomley <jejb@titanic> | 2005-04-18 13:45:00 -0500 |
commit | c46f2ffb9e7fce7208c2639790e1ade42e00b146 (patch) | |
tree | 284912295d46a861930d0619788a650f56c2a29b /drivers/usb/image | |
parent | c2a9331c62216e222a08de8dd58559367fef0af6 (diff) | |
parent | f59114b7b5dc677bbd7cc7e26a5fcb3572a3445c (diff) | |
download | op-kernel-dev-c46f2ffb9e7fce7208c2639790e1ade42e00b146.zip op-kernel-dev-c46f2ffb9e7fce7208c2639790e1ade42e00b146.tar.gz |
merge by hand (scsi_device.h)
Diffstat (limited to 'drivers/usb/image')
-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 de0d32f..cab89a9 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) |