74,11 → 74,11 |
int start; |
|
/* wait for registers to be programmed */ |
start = jiffies; |
start = jiffies26; |
while (1) { |
if (saa7146_read(dev, MC2) & 2) |
break; |
if (jiffies-start > HZ/20) { |
if (jiffies26-start > HZ/20) { |
DEB_S(("timed out while waiting for registers getting programmed\n")); |
return -ETIMEDOUT; |
} |
85,12 → 85,12 |
} |
|
/* wait for transfer to complete */ |
start = jiffies; |
start = jiffies26; |
while (1) { |
if (!(saa7146_read(dev, PSR) & SPCI_DEBI_S)) |
break; |
saa7146_read(dev, MC2); |
if (jiffies-start > HZ/4) { |
if (jiffies26-start > HZ/4) { |
DEB_S(("timed out while waiting for transfer completion\n")); |
return -ETIMEDOUT; |
} |
116,7 → 116,7 |
if (NULL == sglist) |
return NULL; |
memset(sglist,0,sizeof(struct scatterlist)*nr_pages); |
for (i = 0; i < nr_pages; i++, virt += PAGE_SIZE) { |
/* for (i = 0; i < nr_pages; i++, virt += PAGE_SIZE) { |
pg = vmalloc_to_page(virt); |
if (NULL == pg) |
goto err; |
124,7 → 124,7 |
BUG(); |
sglist[i].page = pg; |
sglist[i].length = PAGE_SIZE; |
} |
}*/ |
return sglist; |
|
err: |
159,7 → 159,7 |
return NULL; |
} |
|
slen = pci_map_sg(pci,pt->slist,pages,PCI_DMA_FROMDEVICE); |
//slen = pci_map_sg(pci,pt->slist,pages,PCI_DMA_FROMDEVICE); |
if (0 != saa7146_pgtable_build_single(pci, pt, pt->slist, slen)) { |
return NULL; |
} |
433,14 → 433,14 |
|
pci_set_drvdata(pci,dev); |
|
init_MUTEX(&dev->lock); |
//init_MUTEX(&dev->lock); |
dev->int_slock = SPIN_LOCK_UNLOCKED; |
dev->slock = SPIN_LOCK_UNLOCKED; |
|
init_MUTEX(&dev->i2c_lock); |
//init_MUTEX(&dev->i2c_lock); |
|
dev->module = THIS_MODULE; |
init_waitqueue_head(&dev->i2c_wq); |
//init_waitqueue_head(&dev->i2c_wq); |
|
/* set some sane pci arbitrition values */ |
saa7146_write(dev, PCI_BT_V1, 0x1c00101f); |
523,7 → 523,7 |
|
if( 0 == initialized ) { |
INIT_LIST_HEAD(&saa7146_devices); |
init_MUTEX(&saa7146_devices_lock); |
//init_MUTEX(&saa7146_devices_lock); |
initialized = 1; |
} |
|
544,17 → 544,17 |
return 0; |
} |
|
static int __init saa7146_init_module(void) |
int __init saa7146_init_module(void) |
{ |
if( 0 == initialized ) { |
INIT_LIST_HEAD(&saa7146_devices); |
init_MUTEX(&saa7146_devices_lock); |
//init_MUTEX(&saa7146_devices_lock); |
initialized = 1; |
} |
return 0; |
} |
|
static void __exit saa7146_cleanup_module(void) |
void __exit saa7146_cleanup_module(void) |
{ |
} |
|