sysfs_remove_bin_file: no return value, dump_stack on error

[~andy/linux] / drivers / scsi / lasi700.c

diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
index 8028418b3ad6576924f3282899c3795c3aac7e80..f0871c3ac3d98d279a7d465c487b3b7bd70da65d 100644 (file)
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
@@ -112,7 +112,7 @@ lasi700_probe(struct parisc_device *dev)
 
        hostdata->dev = &dev->dev;
        dma_set_mask(&dev->dev, DMA_32BIT_MASK);
-       hostdata->base = ioremap(base, 0x100);
+       hostdata->base = ioremap_nocache(base, 0x100);
        hostdata->differential = 0;
 
        if (dev->id.sversion == LASI_700_SVERSION) {
@@ -125,15 +125,13 @@ 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)) {
+       if(request_irq(dev->irq, NCR_700_intr, IRQF_SHARED, "lasi700", host)) {
                printk(KERN_ERR "lasi700: request_irq failed!\n");
                goto out_put_host;
        }