File kernel-4.1.patch of Package universII

Overview Repositories Revisions Requests Users Attributes Meta

File kernel-4.1.patch of Package universII

diff --git a/driver-2.6/universeII.c b/driver-2.6/universeII.c
index 9d97093..ce75248 100644
--- a/driver-2.6/universeII.c
+++ b/driver-2.6/universeII.c
@@ -594,21 +594,19 @@ static u32 getPciBaseAddr(u32 size)
     u32 pciAddr, stepping = 0x01000000;
 
     for (pciAddr = MEM_START; pciAddr < MEM_STOP; pciAddr += stepping)
-        if (check_mem_region(pciAddr, size) == 0)
+        if (request_mem_region(pciAddr, size, "universeII") != NULL)
             break;
 
     if (pciAddr >= MEM_STOP) {
         stepping /= 10;
         for (pciAddr = MEM_START; pciAddr < MEM_STOP; pciAddr += stepping)
-            if (check_mem_region(pciAddr, size) == 0)
+            if (request_mem_region(pciAddr, size, "universeII") != NULL)
                 break;
     }
 
     if (pciAddr >= MEM_STOP)
         return 0;
 
-    request_mem_region(pciAddr, size, "universeII");
-
     return pciAddr;
 }
 
@@ -631,7 +629,7 @@ static ssize_t universeII_read(struct file *file, char __user *buf,
 
     void __iomem *image_ptr;
     dma_param_t dmaParam;
-    unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+    unsigned int minor = MINOR(file->f_path.dentry->d_inode->i_rdev);
 
     statistics.reads++;
     switch (minor) {
@@ -789,7 +787,7 @@ static ssize_t universeII_write(struct file *file, const char __user *buf,
 
     void __iomem *image_ptr;
     dma_param_t dmaParam;
-    unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+    unsigned int minor = MINOR(file->f_path.dentry->d_inode->i_rdev);
 
     statistics.writes++;
     switch (minor) {
@@ -921,7 +919,7 @@ static ssize_t universeII_write(struct file *file, const char __user *buf,
 //----------------------------------------------------------------------------
 static int universeII_mmap(struct file *file, struct vm_area_struct *vma)
 {
-    unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+    unsigned int minor = MINOR(file->f_path.dentry->d_inode->i_rdev);
     image_desc_t *p;
 
     file->private_data = &image[minor];
@@ -1063,7 +1061,7 @@ static int universeII_release(struct inode *inode, struct file *file)
 static long universeII_ioctl(struct file *file, unsigned int cmd,
                             unsigned long arg)
 {
-    struct inode *inode = file->f_dentry->d_inode;
+    struct inode *inode = file->f_path.dentry->d_inode;
     unsigned int minor = MINOR(inode->i_rdev);
     unsigned int i = 0;
     u32 ctl = 0, to = 0, bs = 0, bd = 0, imageStart, imageEnd;
@@ -1903,7 +1901,7 @@ static int __init universeII_init(void)
     struct pci_dev *vmicPci = NULL;
 #endif
 
-    printk("UniverseII driver version %s , compiled "__DATE__ " " __TIME__ "\n", Version);
+    printk("UniverseII driver version %s\n", Version);
 
     universeII_dev = pci_get_device(PCI_VENDOR_ID_TUNDRA,
                                      PCI_DEVICE_ID_TUNDRA_CA91C042,

Places

File kernel-4.1.patch of Package universII

Places