Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=99f1f534922a2f2251ba05b14657a1c62882a80e
Commit:     99f1f534922a2f2251ba05b14657a1c62882a80e
Parent:     cedefa13db502432905c29819c195f46805b13eb
Author:     Alan Cox <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 13 16:14:05 2007 -0800
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Tue Dec 18 16:04:11 2007 -0600

    [SCSI] initio: fix conflict when loading driver
    
    > I have a scanner connected to a Initio INI-950 SCSI card and I recently
    > upgraded from SuSE 10.2 to 10.3.  The new kernel doesn't see any of my
    > devices.  I get the following in /var/log/messages:
    >
    > ACPI: PCI Interrupt 0000:00:0a.0[A] -> GSI 17 (level, low) -> IRQ 16
    > initio: I/O port range 0x0 is busy.
    > ACPI: PCI interrupt for device 0000:00:0a.0 disabled
    
    Humm not a collision - thats a bug in the driver updating.  Looks like the
    changes I made and combined with Christoph's lost a line somewhere when I
    was merging it all.
    
    Signed-off-by: Alan Cox <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 drivers/scsi/initio.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 4c4465d..769a7a8 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -2867,6 +2867,7 @@ static int initio_probe_one(struct pci_dev *pdev,
        }
        host = (struct initio_host *)shost->hostdata;
        memset(host, 0, sizeof(struct initio_host));
+       host->addr = pci_resource_start(pdev, 0);
 
        if (!request_region(host->addr, 256, "i91u")) {
                printk(KERN_WARNING "initio: I/O port range 0x%x is busy.\n", 
host->addr);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to