---

yaml --- r: 23621 b: refs/heads/master c: a9312fb h: refs/heads/master i: 23619: 8b127d1 v: v3
git-mirror · Mar 25, 2006 · 503d94b · 503d94b
1 parent 662863a
commit 503d94b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9e102b60c51faa62506132e8780d8003888c98f
+refs/heads/master: a9312fb839e90668d05a90024f3a7e7ff646a4a3
diff --git a/trunk/drivers/scsi/sd.c b/trunk/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;