From owner-freebsd-scsi@FreeBSD.ORG Wed Apr 30 17:12:36 2003 Return-Path: Delivered-To: freebsd-scsi@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A998C37B401 for ; Wed, 30 Apr 2003 17:12:36 -0700 (PDT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id E865343F3F for ; Wed, 30 Apr 2003 17:12:35 -0700 (PDT) (envelope-from marcel@xcllnt.net) Received: from athlon.pn.xcllnt.net (athlon.pn.xcllnt.net [192.168.4.3]) by ns1.xcllnt.net (8.12.9/8.12.9) with ESMTP id h410CZwk058326 for ; Wed, 30 Apr 2003 17:12:35 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from athlon.pn.xcllnt.net (localhost [127.0.0.1]) by athlon.pn.xcllnt.net (8.12.9/8.12.9) with ESMTP id h410CZpk000965 for ; Wed, 30 Apr 2003 17:12:35 -0700 (PDT) (envelope-from marcel@athlon.pn.xcllnt.net) Received: (from marcel@localhost) by athlon.pn.xcllnt.net (8.12.9/8.12.9/Submit) id h410CZg1000964 for scsi@FreeBSD.org; Wed, 30 Apr 2003 17:12:35 -0700 (PDT) Date: Wed, 30 Apr 2003 17:12:35 -0700 From: Marcel Moolenaar To: scsi@FreeBSD.org Message-ID: <20030501001235.GA932@athlon.pn.xcllnt.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="BOKacYhQ+x31HxR3" Content-Disposition: inline User-Agent: Mutt/1.5.3i Subject: [patch] Fix for ia64 tinderbox failure X-BeenThere: freebsd-scsi@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: SCSI subsystem List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 May 2003 00:12:37 -0000 --BOKacYhQ+x31HxR3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Gang, Please review the attached patch to fix the "variable may be used uninitialized" warning (and thus build failure) on ia64. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net --BOKacYhQ+x31HxR3 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="scsi.diff" Index: scsi_da.c =================================================================== RCS file: /home/ncvs/src/sys/cam/scsi/scsi_da.c,v retrieving revision 1.140 diff -u -r1.140 scsi_da.c --- scsi_da.c 30 Apr 2003 13:36:51 -0000 1.140 +++ scsi_da.c 1 May 2003 00:07:59 -0000 @@ -1821,7 +1821,7 @@ if (maxsector != 0xffffffff) goto done; } else - goto done; + goto fail; rcaplong = (struct scsi_read_capacity_data_long *)rcap; @@ -1858,6 +1858,8 @@ if (error == 0) dasetgeom(periph, block_len, maxsector); + +fail: xpt_release_ccb(ccb); --BOKacYhQ+x31HxR3--