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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
media
/
video
/
tvmixer.c
diff --git
a/drivers/media/video/tvmixer.c
b/drivers/media/video/tvmixer.c
index
9e86cae
..
1654576
100644
(file)
--- a/
drivers/media/video/tvmixer.c
+++ b/
drivers/media/video/tvmixer.c
@@
-198,10
+198,6
@@
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;
@@
-217,10
+213,6
@@
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;