X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fscsi%2Fsd.c;h=c647d85d97d14555fc93f02d28ed98d580ff3be3;hb=63518472c05a351d779f35803e6ccfb361ae630a;hp=024ef86c52425cd9b3f5ed05b380dad3b0eff2c0;hpb=f01c18456993bab43067b678f56c87ca954aa43b;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 024ef86c524..c647d85d97d 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,
 	if (scsi_mode_sense(sdp, 0x08, 8, buffer, sizeof(buffer), SD_TIMEOUT,
 			    SD_MAX_RETRIES, &data, NULL))
 		return -EINVAL;
-	len = min(sizeof(buffer), data.length - data.header_length -
+	len = min_t(size_t, sizeof(buffer), data.length - data.header_length -
 		  data.block_descriptor_length);
 	buffer_data = buffer + data.header_length +
 		data.block_descriptor_length;