From owner-cvs-all@FreeBSD.ORG Mon Jan 8 19:20:25 2007 Return-Path: X-Original-To: cvs-all@freebsd.org Delivered-To: cvs-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 20C9516A403; Mon, 8 Jan 2007 19:20:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id 1EC0A13C44B; Mon, 8 Jan 2007 19:20:23 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id l08JKDdg068399; Mon, 8 Jan 2007 14:20:20 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Pyun YongHyeon Date: Mon, 8 Jan 2007 11:35:59 -0500 User-Agent: KMail/1.9.1 References: <200701080019.l080Js9g077860@repoman.freebsd.org> In-Reply-To: <200701080019.l080Js9g077860@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200701081135.59717.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Mon, 08 Jan 2007 14:20:21 -0500 (EST) X-Virus-Scanned: ClamAV 0.88.3/2424/Mon Jan 8 11:46:49 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/dev/msk if_msk.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jan 2007 19:20:25 -0000 On Sunday 07 January 2007 19:19, Pyun YongHyeon wrote: > yongari 2007-01-08 00:19:53 UTC > > FreeBSD src repository > > Modified files: > sys/dev/msk if_msk.c > Log: > Initialize legacy SYS_RES_IRQ resources before attempting to use MSI. > This fixes legacy SYS_RES_IRQ resource allocation failure when MSI is > disabled. > > Reported by: rrs > Tested by: rrs Gah, my bad. I would prefer to set it down before the 'if (msic == 2...)' so all the logic for it is in one place, but anyways, you should remove the now-duplicate setting here: } else { pci_release_msi(dev); sc->msk_irq_spec = msk_irq_spec_legacy; } -- John Baldwin