aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-17 00:51:31 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-17 00:51:31 -0400
commita2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch)
tree2def96ef17c0672c30f1a10287552978bf1d0b1c /drivers/scsi/sd.c
parentedb3366703224d5d8df573ae698ccd6b488dc743 (diff)
parent2ad56496627630ebc99f06af5f81ca23e17e014e (diff)
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index bb8235598787..0410e1bf109a 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -373,9 +373,6 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
373 SCpnt->cmnd[7] = (unsigned char) (this_count >> 8) & 0xff; 373 SCpnt->cmnd[7] = (unsigned char) (this_count >> 8) & 0xff;
374 SCpnt->cmnd[8] = (unsigned char) this_count & 0xff; 374 SCpnt->cmnd[8] = (unsigned char) this_count & 0xff;
375 } else { 375 } else {
376 if (this_count > 0xff)
377 this_count = 0xff;
378
379 SCpnt->cmnd[1] |= (unsigned char) ((block >> 16) & 0x1f); 376 SCpnt->cmnd[1] |= (unsigned char) ((block >> 16) & 0x1f);
380 SCpnt->cmnd[2] = (unsigned char) ((block >> 8) & 0xff); 377 SCpnt->cmnd[2] = (unsigned char) ((block >> 8) & 0xff);
381 SCpnt->cmnd[3] = (unsigned char) block & 0xff; 378 SCpnt->cmnd[3] = (unsigned char) block & 0xff;