mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 22:51:35 +00:00
[PATCH] git-scsi-misc: min() warning fix
drivers/scsi/sd.c: In function `sd_store_cache_type': drivers/scsi/sd.c:193: warning: comparison of distinct pointer types lacks a cast Cc: James Bottomley <James.Bottomley@steeleye.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
a9e102b60c
commit
a9312fb839
@ -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,
|
if (scsi_mode_sense(sdp, 0x08, 8, buffer, sizeof(buffer), SD_TIMEOUT,
|
||||||
SD_MAX_RETRIES, &data, NULL))
|
SD_MAX_RETRIES, &data, NULL))
|
||||||
return -EINVAL;
|
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);
|
data.block_descriptor_length);
|
||||||
buffer_data = buffer + data.header_length +
|
buffer_data = buffer + data.header_length +
|
||||||
data.block_descriptor_length;
|
data.block_descriptor_length;
|
||||||
|
Loading…
Reference in New Issue
Block a user