patch-2.4.0-test6 linux/drivers/char/bttv-driver.c

• Lines: 74
• Date: Mon Aug 7 21:01:35 2000
• Orig file: v2.4.0-test5/linux/drivers/char/bttv-driver.c
• Orig date: Thu Jul 27 17:38:00 2000

diff -u --recursive --new-file v2.4.0-test5/linux/drivers/char/bttv-driver.c linux/drivers/char/bttv-driver.c
@@ -132,8 +132,10 @@
                 if (!pmd_none(*pmd)) {
                         ptep = pte_offset(pmd, adr);
                         pte = *ptep;
-                        if(pte_present(pte))
-                                ret = (page_address(pte_page(pte))|(adr&(PAGE_SIZE-1)));
+                        if(pte_present(pte)) {
+				ret = (unsigned long) page_address(pte_page(pte));
+                                ret |= (adr & (PAGE_SIZE - 1));
+			}
                 }
         }
         MDEBUG(printk("uv2kva(%lx-->%lx)", adr, ret));
@@ -189,7 +191,7 @@
 		while (size > 0) 
                 {
 	                page = kvirt_to_pa(adr);
-			mem_map_reserve(MAP_NR(__va(page)));
+			mem_map_reserve(virt_to_page(__va(page)));
 			adr+=PAGE_SIZE;
 			size-=PAGE_SIZE;
 		}
@@ -207,7 +209,7 @@
 		while (size > 0) 
                 {
 	                page = kvirt_to_pa(adr);
-			mem_map_unreserve(MAP_NR(__va(page)));
+			mem_map_unreserve(virt_to_page(__va(page)));
 			adr+=PAGE_SIZE;
 			size-=PAGE_SIZE;
 		}
@@ -1157,7 +1159,7 @@
 
 	offset   = iobuf->offset;
 	page     = 0;
-	pageaddr = virt_to_bus((void*)page_address(iobuf->maplist[page]));
+	pageaddr = virt_to_bus(page_address(iobuf->maplist[page]));
 	for (line=0; line < (height<<(1^inter)); line++)
 	{
 	        if (inter) 
@@ -1178,13 +1180,13 @@
 			todo -= bl;
 			offset = 0;
 			page++;
-			pageaddr = virt_to_bus((void*)page_address(iobuf->maplist[page]));
+			pageaddr = virt_to_bus(page_address(iobuf->maplist[page]));
 			while (todo>PAGE_SIZE)
 			{
 			        *((*rp)++)=cpu_to_le32(BT848_RISC_WRITE|PAGE_SIZE);
 				*((*rp)++)=cpu_to_le32(pageaddr);
 				page++;
-				pageaddr = virt_to_bus((void*)page_address(iobuf->maplist[page]));
+				pageaddr = virt_to_bus(page_address(iobuf->maplist[page]));
 			}
 			*((*rp)++)=cpu_to_le32(BT848_RISC_WRITE|BT848_RISC_EOL|todo);
 			*((*rp)++)=cpu_to_le32(pageaddr);
@@ -2112,7 +2114,7 @@
 		       iobuf->locked);
 		printk("bttv%d: hack: pages (bus addr):",btv->nr);
 		for (i = 0; i < iobuf->nr_pages; i++) {
-			printk(" %lx", virt_to_bus((void*)page_address(iobuf->maplist[i])));
+			printk(" %lx", virt_to_bus(page_address(iobuf->maplist[i])));
 		}
 		printk("\n");
 
@@ -3032,7 +3034,7 @@
         struct bttv *btv = PCI_GET_DRIVER_DATA(pci_dev);
 
         /* unregister i2c_bus */
-	if (btv->i2c_ok)
+	if (0 == btv->i2c_ok)
 		i2c_bit_del_bus(&btv->i2c_adap);
 
         /* turn off all capturing, DMA and IRQs */