projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6-block.git]
/
block
/
scsi_ioctl.c
diff --git
a/block/scsi_ioctl.c
b/block/scsi_ioctl.c
index 55b6f15dac900af77a5ad7038cd98f3133d816a8..dda653ce7b24cfb959f668bdb4a676900ed7637d 100644
(file)
--- a/
block/scsi_ioctl.c
+++ b/
block/scsi_ioctl.c
@@
-326,8
+326,8
@@
static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
goto out_put_request;
}
- ret =
-EFAULT
;
- if (
blk_fill_sghdr_rq(q, rq, hdr, mode)
)
+ ret =
blk_fill_sghdr_rq(q, rq, hdr, mode)
;
+ if (
ret < 0
)
goto out_free_cdb;
ret = 0;