diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:30:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:30:12 -0500 |
| commit | f61ea1b0c825a20a1826bb43a226387091934586 (patch) | |
| tree | fdedf0a2368f707e3fd5205db05bfcbac79606ec /block/scsi_ioctl.c | |
| parent | d347da0deffa1d8f88f0d270eab040e4707c9916 (diff) | |
| parent | 7b32b8e018d8f8cc94c808a5fa84a3f889441b91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'block/scsi_ioctl.c')
| -rw-r--r-- | block/scsi_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 6e7db2e79f42..1d8852f7bbff 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
| @@ -233,7 +233,7 @@ static int sg_io(struct file *file, request_queue_t *q, | |||
| 233 | if (verify_command(file, cmd)) | 233 | if (verify_command(file, cmd)) |
| 234 | return -EPERM; | 234 | return -EPERM; |
| 235 | 235 | ||
| 236 | if (hdr->dxfer_len > (q->max_sectors << 9)) | 236 | if (hdr->dxfer_len > (q->max_hw_sectors << 9)) |
| 237 | return -EIO; | 237 | return -EIO; |
| 238 | 238 | ||
| 239 | if (hdr->dxfer_len) | 239 | if (hdr->dxfer_len) |