Minor changes; Compilable version

diff --git a/mf614.c b/mf614.c
index abdbb5b9c6cba95a2c94bb986ae51168084f83bc..3b522a62c919e92223782b76e0162a0fbb480a76 100644 (file)
--- a/mf614.c
+++ b/mf614.c
@@ -18,13 +18,17 @@ static irqreturn_t mf614_irq_handler(int irq, struct uio_info *dev_info)
 {
        void __iomem *status_reg = dev_info->priv + STATUS_OFFSET;
 
-       if ((status_reg & STATUS_T5INTE) && (status_reg & STATUS_T5)) {
-               iowrite8(ioread8(status_reg) & ~STATUS_T5, status_reg);
+       if ((ioread16(status_reg) & STATUS_T5INTE) 
+               && (ioread16(status_reg) & STATUS_T5))
+       {
+               iowrite16(ioread16(status_reg) & ~STATUS_T5, status_reg);
                return IRQ_HANDLED;
        }
 
-       if ((status_reg & STATUS_CCINTE) && (status_reg & STATUS_CC)) {
-               iowrite8(ioread8(status_reg) & ~STATUS_CC, status_reg);
+       if ((ioread16(status_reg) & STATUS_CCINTE) 
+               && (ioread16(status_reg) & STATUS_CC))
+       {
+               iowrite16(ioread16(status_reg) & ~STATUS_CC, status_reg);
                return IRQ_HANDLED;
        }
 
@@ -41,10 +45,10 @@ static int __devinit mf614_pci_probe(struct pci_dev *dev,
                return -ENOMEM;
        
        if (pci_enable_device(dev)) //FIXME what is return value??
-               goto out_free
+               goto out_free;
 
        if (pci_request_regions(dev, "mf614"))
-               goto out_disable
+               goto out_disable;
        
        info->name = "MF614";
        info->version = "0.0.1";
@@ -65,13 +69,13 @@ static int __devinit mf614_pci_probe(struct pci_dev *dev,
        if (!info->priv)
                goto out_release; 
        
-       info->mem[1].addr = pci_resource_start(dev, 4);
-       if (!info->mem[1].addr)
+       info->mem[0].addr = pci_resource_start(dev, 4);
+       if (!info->mem[0].addr)
                goto out_release;
-       info->mem[1].size = pci_resource_len(dev, 4);
-       info->mem[1].memtype = UIO_MEM_PHYS;
-       info->mem[1].internal_addr = pci_ioremap_bar(dev, 4);
-       if (!info->mem[1].internal_addr)
+       info->mem[0].size = pci_resource_len(dev, 4);
+       info->mem[0].memtype = UIO_MEM_PHYS;
+       info->mem[0].internal_addr = pci_ioremap_bar(dev, 4);
+       if (!info->mem[0].internal_addr)
                goto out_release;
        
        info->irq = dev->irq;
@@ -86,7 +90,7 @@ static int __devinit mf614_pci_probe(struct pci_dev *dev,
        return 0;
 
 out_unmap:
-       iounmap(info->mem[1].internal_addr);
+       iounmap(info->mem[0].internal_addr);
 out_release:
        pci_release_regions(dev);
 out_disable: