diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 13:28:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 13:28:47 -0700 |
| commit | 2d986010ad13a00b83851238d52601d6092df40e (patch) | |
| tree | 6a43ffd30290fc051435643d485ad12fb1448ed5 /drivers/scsi/sd.c | |
| parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
| parent | e10fb91c4dc81a4ae47caf0828df152f600f2546 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index bb823559878..0410e1bf109 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -373,9 +373,6 @@ static int sd_init_command(struct scsi_cmnd * SCpnt) SCpnt->cmnd[7] = (unsigned char) (this_count >> 8) & 0xff; SCpnt->cmnd[8] = (unsigned char) this_count & 0xff; } else { - if (this_count > 0xff) - this_count = 0xff; - SCpnt->cmnd[1] |= (unsigned char) ((block >> 16) & 0x1f); SCpnt->cmnd[2] = (unsigned char) ((block >> 8) & 0xff); SCpnt->cmnd[3] = (unsigned char) block & 0xff; |