git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
media
/
common
/
saa7146_core.c
diff --git
a/drivers/media/common/saa7146_core.c
b/drivers/media/common/saa7146_core.c
index
8cdd4d2
..
04c1938
100644
(file)
--- a/
drivers/media/common/saa7146_core.c
+++ b/
drivers/media/common/saa7146_core.c
@@
-21,7
+21,7
@@
#include <media/saa7146.h>
LIST_HEAD(saa7146_devices);
#include <media/saa7146.h>
LIST_HEAD(saa7146_devices);
-DE
FIN
E_MUTEX(saa7146_devices_lock);
+DE
CLAR
E_MUTEX(saa7146_devices_lock);
static int saa7146_num;
static int saa7146_num;
@@
-116,7
+116,8
@@
static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
pg = vmalloc_to_page(virt);
if (NULL == pg)
goto err;
pg = vmalloc_to_page(virt);
if (NULL == pg)
goto err;
- BUG_ON(PageHighMem(pg));
+ if (PageHighMem(pg))
+ BUG();
sglist[i].page = pg;
sglist[i].length = PAGE_SIZE;
}
sglist[i].page = pg;
sglist[i].length = PAGE_SIZE;
}
@@
-401,11
+402,11
@@
static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
pci_set_drvdata(pci, dev);
pci_set_drvdata(pci, dev);
-
mutex_init
(&dev->lock);
+
init_MUTEX
(&dev->lock);
spin_lock_init(&dev->int_slock);
spin_lock_init(&dev->slock);
spin_lock_init(&dev->int_slock);
spin_lock_init(&dev->slock);
-
mutex_init
(&dev->i2c_lock);
+
init_MUTEX
(&dev->i2c_lock);
dev->module = THIS_MODULE;
init_waitqueue_head(&dev->i2c_wq);
dev->module = THIS_MODULE;
init_waitqueue_head(&dev->i2c_wq);