Re: a trival bug of megaraid in patch 2.6.12-mm1

[bobl <bobl@turbolinux.com>]

Michael Buesch wrote:

>Quoting bobl <bobl@turbolinux.com>:
>  
>
>>    The attachment is the patch, please confirm it.
>>    
>>
>
>  
>
>>diff -purN linux-2.6.12/drivers/scsi/megaraid.c linux-2.6.12.new/drivers/scsi/megaraid.c
>>--- linux-2.6.12/drivers/scsi/megaraid.c        2005-06-21 18:49:50.118732304 +0900
>>+++ linux-2.6.12.new/drivers/scsi/megaraid.c    2005-06-21 18:57:55.266978560 +0900
>>@@ -1975,6 +1975,7 @@ __megaraid_reset(Scsi_Cmnd *cmd)
>> static int
>> megaraid_reset(Scsi_Cmnd *cmd)
>> {
>>+       adapter_t       *adapter;
>>        adapter = (adapter_t *)cmd->device->host->hostdata;
>>        int rc;
>>    
>>
>
>That's mixed code and declarations (aka Not Good (tm)).
>Please do something like this instead:
>
>-       adapter = (adapter_t *)cmd->device->host->hostdata;
>+       adapter_t *adapter = (adapter_t *)cmd->device->host->hostdata;
>        int rc;
>
>
>  
>

Thanks!

The attachment is the new one!

diff -purN linux-2.6.12.orig/drivers/scsi/megaraid.c linux-2.6.12.new/drivers/scsi/megaraid.c
--- linux-2.6.12.orig/drivers/scsi/megaraid.c	2005-06-21 19:37:38.846619376 +0900
+++ linux-2.6.12.new/drivers/scsi/megaraid.c	2005-06-21 19:38:03.241910728 +0900
@@ -1975,7 +1975,7 @@ __megaraid_reset(Scsi_Cmnd *cmd)
 static int
 megaraid_reset(Scsi_Cmnd *cmd)
 {
-	adapter = (adapter_t *)cmd->device->host->hostdata;
+	adapter_t *adapter = (adapter_t *)cmd->device->host->hostdata;
 	int rc;
 
 	spin_lock_irq(&adapter->lock);