diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
| commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
| tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /drivers/scsi/sd.c | |
| parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 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; |