From bfcf5b1b91b5b84f859fefcc8c7a9140780d7d4f Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 15 Oct 2007 20:51:32 +0100 Subject: [PATCH] --- yaml --- r: 72315 b: refs/heads/master c: e9e42faf47255274a1ed0b9bf1c46118023ec5fa h: refs/heads/master i: 72313: b29c814364a252732b3e67ddbb499d13bbc7a976 72311: 43d11cf55e5543ea01c3faeb9ebd1be460fe423b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/initio.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 24007a37c0f5..77a85635ad1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fec02c93f60fb44ba3a24a0d3e4a52521d34d3f +refs/heads/master: e9e42faf47255274a1ed0b9bf1c46118023ec5fa diff --git a/trunk/drivers/scsi/initio.c b/trunk/drivers/scsi/initio.c index 22d40fd5845b..4c4465d39a1d 100644 --- a/trunk/drivers/scsi/initio.c +++ b/trunk/drivers/scsi/initio.c @@ -665,7 +665,7 @@ static void initio_init(struct initio_host * host, u8 *bios_addr) host->max_tags[i] = 0xFF; } /* for */ printk("i91u: PCI Base=0x%04X, IRQ=%d, BIOS=0x%04X0, SCSI ID=%d\n", - host->addr, host->irq, + host->addr, host->pci_dev->irq, host->bios_addr, host->scsi_id); /* Reset SCSI Bus */ if (host->config & HCC_SCSI_RESET) { @@ -2891,6 +2891,8 @@ static int initio_probe_one(struct pci_dev *pdev, goto out_release_region; } + host->pci_dev = pdev; + host->num_scbs = num_scb; host->scb = scb; host->next_pending = scb; @@ -2905,6 +2907,7 @@ static int initio_probe_one(struct pci_dev *pdev, host->scb_end = tmp; host->first_avail = scb; host->last_avail = prev; + spin_lock_init(&host->avail_lock); initio_init(host, phys_to_virt(bios_seg << 4)); @@ -2928,7 +2931,6 @@ static int initio_probe_one(struct pci_dev *pdev, } pci_set_drvdata(pdev, shost); - host->pci_dev = pdev; error = scsi_add_host(shost, &pdev->dev); if (error)