linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* cciss updates for 2.4.24-pre1, 1 of 2
@ 2003-12-16 23:50 mikem
  2003-12-17 22:49 ` Jens Axboe
  0 siblings, 1 reply; 2+ messages in thread
From: mikem @ 2003-12-16 23:50 UTC (permalink / raw)
  To: axboe, marcelo.tosatti; +Cc: linux-kernel, mike.miller, scott.benesh

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;
 	}

-------------------------------------------------------------------------------

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: cciss updates for 2.4.24-pre1, 1 of 2
  2003-12-16 23:50 cciss updates for 2.4.24-pre1, 1 of 2 mikem
@ 2003-12-17 22:49 ` Jens Axboe
  0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2003-12-17 22:49 UTC (permalink / raw)
  To: mikem; +Cc: marcelo.tosatti, linux-kernel, mike.miller, scott.benesh

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


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2003-12-17 22:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-12-16 23:50 cciss updates for 2.4.24-pre1, 1 of 2 mikem
2003-12-17 22:49 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).