From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264595AbTLQWtr (ORCPT ); Wed, 17 Dec 2003 17:49:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264598AbTLQWtr (ORCPT ); Wed, 17 Dec 2003 17:49:47 -0500 Received: from ns.virtualhost.dk ([195.184.98.160]:1246 "EHLO virtualhost.dk") by vger.kernel.org with ESMTP id S264595AbTLQWtp (ORCPT ); Wed, 17 Dec 2003 17:49:45 -0500 Date: Wed, 17 Dec 2003 23:49:36 +0100 From: Jens Axboe To: mikem@beardog.cca.cpqcorp.net Cc: marcelo.tosatti@cyclades.com, linux-kernel@vger.kernel.org, mike.miller@hp.com, scott.benesh@hp.com Subject: Re: cciss updates for 2.4.24-pre1, 1 of 2 Message-ID: <20031217224936.GM2495@suse.de> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 16 2003, mikem@beardog.cca.cpqcorp.net wrote: > Under certain conditions if the cciss driver fails to load the pointer to > the hba may be null when trying to free the I/O memory. This patch fixes > that problem and removes a no longer valid comment. > This is #1 of 2 and should be applied first. Please consider this patch > for inclusion in the 2.4.24 kernel. > > Thanks, > mikem > mike.miller@hp.com > ------------------------------------------------------------------------------ > diff -burN lx2424pre1.orig/drivers/block/cciss.c lx2424pre1/drivers/block/cciss.c > --- lx2424pre1.orig/drivers/block/cciss.c 2003-11-28 12:26:19.000000000 -0600 > +++ lx2424pre1/drivers/block/cciss.c 2003-12-16 17:25:50.000000000 -0600 > @@ -2612,7 +2612,6 @@ > > /* get the address index number */ > cfg_base_addr = readl(c->vaddr + SA5_CTCFG_OFFSET); > - /* I am not prepared to deal with a 64 bit address value */ > cfg_base_addr &= (__u32) 0x0000ffff; > #ifdef CCISS_DEBUG > printk("cfg base address = %x\n", cfg_base_addr); > @@ -2624,7 +2623,7 @@ > #endif /* CCISS_DEBUG */ > if (cfg_base_addr_index == -1) { > printk(KERN_WARNING "cciss: Cannot find cfg_base_addr_index\n"); > - release_io_mem(hba[i]); > + release_io_mem(c); > return -1; > } Looks fine to apply. -- Jens Axboe