From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422772AbWBNUCj (ORCPT ); Tue, 14 Feb 2006 15:02:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1422777AbWBNUCi (ORCPT ); Tue, 14 Feb 2006 15:02:38 -0500 Received: from cantor2.suse.de ([195.135.220.15]:15021 "EHLO mx2.suse.de") by vger.kernel.org with ESMTP id S1422772AbWBNUCi (ORCPT ); Tue, 14 Feb 2006 15:02:38 -0500 Date: Tue, 14 Feb 2006 21:02:37 +0100 Message-ID: From: Takashi Iwai To: Andrew Morton Cc: linux-kernel@vger.kernel.org Subject: [PATCH trivial] Fix the comparison with sizeof() User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta21) (corn) (+CVS-20050720) (i386-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Fix the comparison with sizeof() in min() macro. Signed-off-by: Takashi Iwai --- diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index 7139659..6be4fb3 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -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]); }