patch-2.4.6 linux/drivers/scsi/scsi_ioctl.c
Next file: linux/drivers/scsi/scsi_proc.c
Previous file: linux/drivers/scsi/scsi.c
Back to the patch index
Back to the overall index
- Lines: 23
- Date:
Mon Jun 11 19:15:27 2001
- Orig file:
v2.4.5/linux/drivers/scsi/scsi_ioctl.c
- Orig date:
Fri Apr 27 13:59:19 2001
diff -u --recursive --new-file v2.4.5/linux/drivers/scsi/scsi_ioctl.c linux/drivers/scsi/scsi_ioctl.c
@@ -312,17 +312,17 @@
/*
* If there was an error condition, pass the info back to the user.
*/
+ result = SRpnt->sr_result;
if (SRpnt->sr_result) {
int sb_len = sizeof(SRpnt->sr_sense_buffer);
sb_len = (sb_len > OMAX_SB_LEN) ? OMAX_SB_LEN : sb_len;
if (copy_to_user(cmd_in, SRpnt->sr_sense_buffer, sb_len))
- return -EFAULT;
- } else
+ result = -EFAULT;
+ } else {
if (copy_to_user(cmd_in, buf, outlen))
- return -EFAULT;
-
- result = SRpnt->sr_result;
+ result = -EFAULT;
+ }
SDpnt = SRpnt->sr_device;
scsi_release_request(SRpnt);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)