Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9312fb8 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a9e102b6

drivers/scsi/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -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;