]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/scsi/lasi700.c
[SCSI] qla2xxx: Correct synchronization issues during rport addition/deletion.
[linux-2.6-omap-h63xx.git] / drivers / scsi / lasi700.c
index 29f250c80b98fae57af1ae5ed056f8a75230fddf..459a4daebece319729f180beb047ac5b4da2b1f1 100644 (file)
@@ -98,7 +98,7 @@ MODULE_DEVICE_TABLE(parisc, lasi700_ids);
 static int __init
 lasi700_probe(struct parisc_device *dev)
 {
-       unsigned long base = dev->hpa + LASI_SCSI_CORE_OFFSET;
+       unsigned long base = dev->hpa.start + LASI_SCSI_CORE_OFFSET;
        struct NCR_700_Host_Parameters *hostdata;
        struct Scsi_Host *host;
 
@@ -125,12 +125,11 @@ lasi700_probe(struct parisc_device *dev)
                hostdata->dmode_extra = DMODE_FC2;
        }
 
-       NCR_700_set_mem_mapped(hostdata);
-
        host = NCR_700_detect(&lasi700_template, hostdata, &dev->dev);
        if (!host)
                goto out_kfree;
        host->this_id = 7;
+       host->base = base;
        host->irq = dev->irq;
        if(request_irq(dev->irq, NCR_700_intr, SA_SHIRQ, "lasi700", host)) {
                printk(KERN_ERR "lasi700: request_irq failed!\n");
@@ -167,7 +166,7 @@ lasi700_driver_remove(struct parisc_device *dev)
 }
 
 static struct parisc_driver lasi700_driver = {
-       .name =         "Lasi SCSI",
+       .name =         "lasi_scsi",
        .id_table =     lasi700_ids,
        .probe =        lasi700_probe,
        .remove =       __devexit_p(lasi700_driver_remove),