From 503d94b152966dcc7872dcadbb9451859b96dcd5 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 25 Mar 2006 03:08:30 -0800 Subject: [PATCH] --- yaml --- r: 23621 b: refs/heads/master c: a9312fb839e90668d05a90024f3a7e7ff646a4a3 h: refs/heads/master i: 23619: 8b127d138d1a5c6217415d64fcae8b0d259030ae v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index af131a0a3f85..d328d8cff4cf 100644 --- 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 index 024ef86c5242..c647d85d97d1 100644 --- 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;