From: Takashi Iwai <tiwai@xxxxxxx>
Fix the comparison with sizeof() in min() macro.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/aacraid/aachba.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/scsi/aacraid/aachba.c~aacraid-fix-the-comparison-with-sizeof drivers/scsi/aacraid/aachba.c
--- devel/drivers/scsi/aacraid/aachba.c~aacraid-fix-the-comparison-with-sizeof 2006-03-08 00:13:07.000000000 -0800
+++ devel-akpm/drivers/scsi/aacraid/aachba.c 2006-03-08 00:13:07.000000000 -0800
@@ -1597,13 +1597,13 @@ int aac_scsi_cmd(struct scsi_cmnd * scsi
cp[11] = 0;
cp[12] = 0;
aac_internal_transfer(scsicmd, cp, 0,
- min((unsigned int)scsicmd->cmnd[13], sizeof(cp)));
+ min((size_t)scsicmd->cmnd[13], sizeof(cp)));
if (sizeof(cp) < scsicmd->cmnd[13]) {
unsigned int len, offset = sizeof(cp);
memset(cp, 0, offset);
do {
- len = min(scsicmd->cmnd[13]-offset, sizeof(cp));
+ len = min((size_t)(scsicmd->cmnd[13]-offset), sizeof(cp));
aac_internal_transfer(scsicmd, cp, offset, len);
} while ((offset += len) < scsicmd->cmnd[13]);
}
_
-
: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
