diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
| commit | e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch) | |
| tree | 2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /drivers/scsi/sd.c | |
| parent | 600511e86babe3727264a0883a3a264f6fb6caf5 (diff) | |
| parent | f3cab8a0b1a772dc8b055b7affa567a366627c9e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 024ef86c5242..c647d85d97d1 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -190,7 +190,7 @@ static ssize_t sd_store_cache_type(struct class_device *cdev, const char *buf, | |||
| 190 | if (scsi_mode_sense(sdp, 0x08, 8, buffer, sizeof(buffer), SD_TIMEOUT, | 190 | if (scsi_mode_sense(sdp, 0x08, 8, buffer, sizeof(buffer), SD_TIMEOUT, |
| 191 | SD_MAX_RETRIES, &data, NULL)) | 191 | SD_MAX_RETRIES, &data, NULL)) |
| 192 | return -EINVAL; | 192 | return -EINVAL; |
| 193 | len = min(sizeof(buffer), data.length - data.header_length - | 193 | len = min_t(size_t, sizeof(buffer), data.length - data.header_length - |
| 194 | data.block_descriptor_length); | 194 | data.block_descriptor_length); |
| 195 | buffer_data = buffer + data.header_length + | 195 | buffer_data = buffer + data.header_length + |
| 196 | data.block_descriptor_length; | 196 | data.block_descriptor_length; |