a trival bug of megaraid in patch 2.6.12-mm1

From: bobl
Date: Tue Jun 21 2005 - 05:10:37 EST


Hi, Andrew Morton:

In 2.6.12-mm1 patch, there are some lines as follow:

300379 +static int
300380 +megaraid_reset(Scsi_Cmnd *cmd)
300381 +{
300382 + adapter = (adapter_t *)cmd->device->host->hostdata;
300383 + int rc;
300384 +
300385 + spin_lock_irq(&adapter->lock);
300386 + rc = __megaraid_reset(cmd);
300387 + spin_unlock_irq(&adapter->lock);
300388 +
300389 + return rc;
300390 +}

I think between line 300381 and 300382 should add follow line:

adapter_t *adapter;

The attachment is the patch, please confirm it.

Best Regards
Bob


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;