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
/
video
/
tvmixer.c
diff --git
a/drivers/media/video/tvmixer.c
b/drivers/media/video/tvmixer.c
index
1654576
..
9e86cae
100644
(file)
--- a/
drivers/media/video/tvmixer.c
+++ b/
drivers/media/video/tvmixer.c
@@
-198,6
+198,10
@@
static int tvmixer_open(struct inode *inode, struct file *file)
/* lock bttv in memory while the mixer is in use */
file->private_data = mix;
/* lock bttv in memory while the mixer is in use */
file->private_data = mix;
+#ifndef I2C_PEC
+ if (client->adapter->inc_use)
+ client->adapter->inc_use(client->adapter);
+#endif
if (client->adapter->owner)
try_module_get(client->adapter->owner);
return 0;
if (client->adapter->owner)
try_module_get(client->adapter->owner);
return 0;
@@
-213,6
+217,10
@@
static int tvmixer_release(struct inode *inode, struct file *file)
return -ENODEV;
}
return -ENODEV;
}
+#ifndef I2C_PEC
+ if (client->adapter->dec_use)
+ client->adapter->dec_use(client->adapter);
+#endif
if (client->adapter->owner)
module_put(client->adapter->owner);
return 0;
if (client->adapter->owner)
module_put(client->adapter->owner);
return 0;