Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / scsi / mvumi.c

diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index 36f6420..3df0269 100644 (file)
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -718,8 +718,8 @@ static int mvumi_host_reset(struct scsi_cmnd *scmd)
 
        mhba = (struct mvumi_hba *) scmd->device->host->hostdata;
 
-       scmd_printk(KERN_NOTICE, scmd, "RESET -%ld cmd=%x retries=%x\n",
-                       scmd->serial_number, scmd->cmnd[0], scmd->retries);
+       scmd_printk(KERN_NOTICE, scmd, "RESET -%u cmd=%x retries=%x\n",
+                       scmd->request->tag, scmd->cmnd[0], scmd->retries);
 
        return mhba->instancet->reset_host(mhba);
 }
@@ -2104,7 +2104,6 @@ static int mvumi_queue_command(struct Scsi_Host *shost,
        unsigned long irq_flags;
 
        spin_lock_irqsave(shost->host_lock, irq_flags);
-       scsi_cmd_get_serial(shost, scmd);
 
        mhba = (struct mvumi_hba *) shost->hostdata;
        scmd->result = 0;